[Opsview-checkins] [opsview] [13283] Merge of 12773 from DEV-professional

[Commit messages for Opsview's subversion repository]

Title: [opsview] [13283] Merge of 12773 from DEV-professional

Revision

13283

Author

tvoon

Date

2013-08-15 19:46:29 +0100 (Thu, 15 Aug 2013)

Log Message

Merge of 12773 from DEV-professional

Modified Paths

• trunk/opsview-web/root/admin/role/local_helper_functions
• trunk/opsview-web/root/admin/role/tab-administration
• trunk/opsview-web/root/admin/role/tab-configuration
• trunk/opsview-web/root/admin/role/tab-role
• trunk/opsview-web/root/admin/role/tab-statusaccess

Property Changed

trunk/

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,10622,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,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772,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,10622,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,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772-12773,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/root/admin/role/local_helper_functions
===================================================================
--- trunk/opsview-web/root/admin/role/local_helper_functions	2013-08-15 18:42:56 UTC (rev 13282)
+++ trunk/opsview-web/root/admin/role/local_helper_functions	2013-08-15 18:46:29 UTC (rev 13283)
@@ -1,12 +1,20 @@
 [%
-MACRO print_access_point(access, label) BLOCK;
-  IF allowed_accesses.$access;
+MACRO print_access_point(access_name, display_label) BLOCK;
+  accessid = allowed_accesses.$access_name;
+  IF accessid;
+    inputid = "access-" _ accessid;
+    "<tr><td>";
     checkbox(
-      label => label,
-      checked => object.has_access(access),
+      checked => object.has_access(access_name),
       name => "accesses",
-      value => allowed_accesses.$access,
+      value => accessid,
+      id => inputid,
     );
+    "</td><td>";
+    "<label for=''>"; access_name; "</label>";
+    "</td><td style='padding-left: 7px'>";
+    "<label for=''>"; display_label; "</label>";
+    "</td></tr>";
   END;
 END;
 %]

Modified: trunk/opsview-web/root/admin/role/tab-administration
===================================================================
--- trunk/opsview-web/root/admin/role/tab-administration	2013-08-15 18:42:56 UTC (rev 13282)
+++ trunk/opsview-web/root/admin/role/tab-administration	2013-08-15 18:46:29 UTC (rev 13283)
@@ -1,83 +1,34 @@
 <div class="panel" id="tab-administration">
 [%
-access          = c.model('OpsviewSchema::Access');
-something_shown = 0;
+accesses_to_display = [];
 
-content = field_label(
+PROCESS "local_helper_functions";
+
+accesses_to_display.push(print_access_point("RELOADACCESS", c.loc('ui.admin.role.edit.administration.reloadaccess')));
+accesses_to_display.push(print_access_point("ADMINACCESS", c.loc('ui.admin.role.edit.administration.adminaccess')));
+accesses_to_display.push(print_access_point("REPORTUSER", c.loc('ui.admin.role.edit.administration.reportuser')));
+accesses_to_display.push(print_access_point("REPORTADMIN", c.loc('ui.admin.role.edit.administration.reportadmin')));
+accesses_to_display.push(print_access_point("PASSWORDSAVE", c.loc('ui.admin.role.edit.administration.passwordsave')));
+
+# Ignore access points that are not valid
+accesses_to_display = accesses_to_display.grep("^.+$");
+
+field_label(
   form_label   => c.loc('ui.admin.role.edit.administration.administration_access'),
   name         => 'access',
   help_keyword => 'administration_access',
-) _ '<table><tr><td>';
+);
 
-IF allowed_accesses.RELOADACCESS;
-  content = content _ checkbox(
-    label   => c.loc('ui.admin.role.edit.administration.reloadaccess'),
-    checked => object.has_access('RELOADACCESS'),
-    name    => 'accesses',
-    value   => allowed_accesses.RELOADACCESS,
-  );
-  something_shown = 1;
-END;
-
-IF allowed_accesses.ADMINACCESS;
-  content = content _ '<br />' _ checkbox(
-    label   => c.loc('ui.admin.role.edit.administration.adminaccess'),
-    checked => object.has_access('ADMINACCESS'),
-    name    => 'accesses',
-    value   => allowed_accesses.ADMINACCESS,
-  );
-  something_shown = 1;
-END;
-
-IF allowed_accesses.REPORTUSER;
-  content = content _ '<br />' _ checkbox(
-    label   => c.loc('ui.admin.role.edit.administration.reportuser'),
-    checked => object.has_access('REPORTUSER'),
-    name    => 'accesses',
-    value   => allowed_accesses.REPORTUSER,
-  );
-  something_shown = 1;
-END;
-
-IF allowed_accesses.REPORTADMIN;
-  content = content _ '<br />' _ checkbox(
-    label   => c.loc('ui.admin.role.edit.administration.reportadmin'),
-    checked => object.has_access('REPORTADMIN'),
-    name    => 'accesses',
-    value   => allowed_accesses.REPORTADMIN,
-  );
-  something_shown = 1;
-END;
-
-IF allowed_accesses.NETFLOW;
-  content = content _ '<br />' _ checkbox(
-    label   => c.loc('ui.admin.role.edit.administration.netflow'),
-    checked => object.has_access('NETFLOW'),
-    name    => 'accesses',
-    value   => allowed_accesses.NETFLOW,
-  );
-  something_shown = 1;
-END;
-
-IF allowed_accesses.PASSWORDSAVE;
-  content = content _ '<br />' _ checkbox(
-    label   => c.loc('ui.admin.role.edit.administration.passwordsave'),
-    checked => object.has_access('PASSWORDSAVE'),
-    name    => 'accesses',
-    value   => allowed_accesses.PASSWORDSAVE,
-  );
-  something_shown = 1;
-END;
-
-content = content _ '</td></tr></table>';
-
-IF something_shown;
-  content;
+IF accesses_to_display.size > 0;
+  '<table>';
+  accesses_to_display.join("\n");
+  '</table>';
 ELSE;
-  '<div class="fields">&nbsp;</div>';
   c.loc('ui.admin.role.edit.administration.no_content') | html;
 END;
 
+"<br/>";
+
 %]
 
 </div>

Modified: trunk/opsview-web/root/admin/role/tab-configuration
===================================================================
--- trunk/opsview-web/root/admin/role/tab-configuration	2013-08-15 18:42:56 UTC (rev 13282)
+++ trunk/opsview-web/root/admin/role/tab-configuration	2013-08-15 18:46:29 UTC (rev 13283)
@@ -40,13 +40,14 @@
 );
 
 IF accesses_to_display.size > 0;
-  '<table><tr><td>';
-  accesses_to_display.join("<br/>");
-  '</td></tr></table>';
+  '<table>';
+  accesses_to_display.join("\n");
+  '</table>';
 ELSE;
   c.loc('ui.admin.role.edit.configuration.no_content') | html;
 END;
 
+"<br/>";
 
 UNLESS is_system_role;
 
@@ -71,6 +72,8 @@
 
 END;
 
+"<br/>";
+
 %]
 
 </div>

Modified: trunk/opsview-web/root/admin/role/tab-role
===================================================================
--- trunk/opsview-web/root/admin/role/tab-role	2013-08-15 18:42:56 UTC (rev 13282)
+++ trunk/opsview-web/root/admin/role/tab-role	2013-08-15 18:46:29 UTC (rev 13283)
@@ -17,5 +17,8 @@
   help_keyword => "description",
 );
 
+
+"<br/>";
+
 %]
 </div>

Modified: trunk/opsview-web/root/admin/role/tab-statusaccess
===================================================================
--- trunk/opsview-web/root/admin/role/tab-statusaccess	2013-08-15 18:42:56 UTC (rev 13282)
+++ trunk/opsview-web/root/admin/role/tab-statusaccess	2013-08-15 18:46:29 UTC (rev 13283)
@@ -28,13 +28,15 @@
   help_keyword => 'status_access',
 );
 IF accesses_to_display.size > 0;
-  '<table><tr><td>';
-  accesses_to_display.join("<br/>");
-  '</td></tr></table>';
+  '<table>';
+  accesses_to_display.join("\n");
+  '</table>';
 ELSE;
   c.loc('ui.admin.role.edit.statusaccess.no_content') | html;
 END;
 
+"<br/>";
+
 %]
 
 </div>

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