respect order of Admin plugins in config when building menu

This commit is contained in:
Oliver Gorwits
2014-01-19 17:48:33 +00:00
parent dc17857d86
commit a7ee00ff1d
3 changed files with 8 additions and 6 deletions

View File

@@ -14,6 +14,7 @@ set(
'_search_tabs' => [], '_search_tabs' => [],
'_device_tabs' => [], '_device_tabs' => [],
'_admin_tasks' => {}, '_admin_tasks' => {},
'_admin_order' => [],
'_reports_menu' => {}, '_reports_menu' => {},
'_reports' => {}, '_reports' => {},
'_report_order' => [qw/Device Port IP Node VLAN Network Wireless/], '_report_order' => [qw/Device Port IP Node VLAN Network Wireless/],
@@ -123,6 +124,7 @@ register 'register_admin_task' => sub {
return error "bad config to register_admin_task"; return error "bad config to register_admin_task";
} }
push @{ setting('_admin_order') }, $config->{tag};
setting('_admin_tasks')->{ $config->{tag} } = $config; setting('_admin_tasks')->{ $config->{tag} } = $config;
}; };

View File

@@ -51,15 +51,15 @@ web_plugins:
- Report::SsidInventory - Report::SsidInventory
- Report::VlanInventory - Report::VlanInventory
- Report::SubnetUtilization - Report::SubnetUtilization
- AdminTask::PortLog
- AdminTask::JobQueue - AdminTask::JobQueue
- AdminTask::PollerPerformance
- AdminTask::SlowDevices
- AdminTask::PseudoDevice
- AdminTask::Topology - AdminTask::Topology
- AdminTask::PollerPerformance
- AdminTask::PseudoDevice
- AdminTask::SlowDevices
- AdminTask::UndiscoveredNeighbors
- AdminTask::UserLog - AdminTask::UserLog
- AdminTask::Users - AdminTask::Users
- AdminTask::PortLog
- AdminTask::UndiscoveredNeighbors
- Search::Device - Search::Device
- Search::Node - Search::Node
- Search::VLAN - Search::VLAN

View File

@@ -105,7 +105,7 @@
</li> </li>
[% IF settings._admin_tasks.size %] [% IF settings._admin_tasks.size %]
<li class="divider"></li> <li class="divider"></li>
[% FOREACH ai IN settings._admin_tasks.keys.sort %] [% FOREACH ai IN settings._admin_order %]
[% NEXT IF settings._admin_tasks.$ai.hidden %] [% NEXT IF settings._admin_tasks.$ai.hidden %]
<li><a href="[% uri_for('/admin/' _ ai) %]">[% settings._admin_tasks.$ai.label | html_entity %]</a></li> <li><a href="[% uri_for('/admin/' _ ai) %]">[% settings._admin_tasks.$ai.label | html_entity %]</a></li>
[% END %] [% END %]