[Opsview-checkins] [opsview] [13269] Merge of 12693 from DEV-professional

Thu, 15 Aug 2013 11:04:09 -0700

Title: [opsview] [13269] Merge of 12693 from DEV-professional
Revision
13269
Author
tvoon
Date
2013-08-15 19:02:53 +0100 (Thu, 15 Aug 2013)

Log Message

Merge of 12693 from DEV-professional

Modified Paths



Property Changed





Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-12679,
 12681-12682,12685,12687,12691-12692,12744,12765,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
   + /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-12679,
 12681-12682,12685,12687,12691-12693,12744,12765,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837

Modified: trunk/opsview-web/lib/Opsview/Web/Controller/NavMenu.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/NavMenu.pm	2013-08-15 17:51:34 UTC (rev 13268)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/NavMenu.pm	2013-08-15 18:02:53 UTC (rev 13269)
@@ -63,6 +63,7 @@
                 CONFIGUREKEYWORDS
                 RELOADACCESS
                 ADMINACCESS
+                CONFIGUREROLES
             );
     }
 
@@ -442,7 +443,8 @@
             $user_access{'CONFIGUREKEYWORDS'} ||
             $user_access{'CONFIGUREPROFILES'} ||
             $user_access{'RELOADACCESS'} ||
-            $user_access{'ADMINACCESS'}
+            $user_access{'ADMINACCESS'} ||
+            $user_access{'CONFIGUREROLES'}
         ) {
             $settings = {
                 url ="" '_javascript_:void(0)',
@@ -509,7 +511,7 @@
                 push @{ $settings->{submenus} }, $advanced;
             }
 
-            if ( $user_access{'CONFIGUREVIEW'} || $user_access{'CONFIGUREPROFILES'} ) {
+            if ( $user_access{'CONFIGUREVIEW'} || $user_access{'CONFIGUREPROFILES'} || $user_access{CONFIGUREROLES} ) {
                 if ( $user_access{'CONFIGUREVIEW'} ) {
                     my $groups = {
                         title => $c->loc("ui.menu.navigation.settings.submenu.groups.title"),
@@ -555,6 +557,13 @@
                             title => $c->loc("ui.menu.navigation.settings.submenu.administration.element.modules.title"),
                         };
                 }
+                elsif ( $user_access{CONFIGUREROLES} ) {
+                    push @{ $administration->{elements} },
+                        {
+                            url ="" $c->uri_for('/admin/role/list')->path_query,
+                            title => $c->loc("ui.menu.navigation.settings.submenu.administration.element.roles.title"),
+                        };
+                }
 
                 if ( $user_access{'CONFIGUREPROFILES'} ) {
                   push @{ $administration->{elements} },


_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins

Reply via email to