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,12609,12611,12615,12645,12653,12663,12744,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,12615,12645,12653,12663,12744,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
Property changes on: trunk/opsview-core/bin/nagconfgen.pl
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0/opsview-core/bin/nagconfgen.pl:6365-6370
/branches/DEV-extra-notification-data/opsview-core/bin/nagconfgen.pl:6734-6746
/branches/DEV-odw-calculations/opsview-core/bin/nagconfgen.pl:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/bin/nagconfgen.pl:9778
/branches/DEV-snmp-multi/opsview-core/bin/nagconfgen.pl:7324-7376
/branches/US187/opsview-core/bin/nagconfgen.pl:9403-9479
/branches/US198b/opsview-core/bin/nagconfgen.pl:8875-8994
/branches/US310/opsview-core/bin/nagconfgen.pl:9851-9873
/branches/US539/opsview-core/bin/nagconfgen.pl:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/bin/nagconfgen.pl:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/bin/nagconfgen.pl: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,12609,12611,12615,12645,12653,12663,12744
/branches/enterprise/DEV-professional/opsview-core/bin-protected/nagconfgen.pl:13211
/branches/nagvis-iframe/opsview-core/bin/nagconfgen.pl:9764-9786
/branches/opsview2runtime/opsview-core/bin/nagconfgen.pl:10960-11258
/branches/opsview2runtime_xs/opsview-core/bin/nagconfgen.pl:11279-11303
/branches/us168/opsview-core/bin/nagconfgen.pl: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/opsview-core/bin/nagconfgen.pl:10944,11017
/commercial/branches/BRAN-4.3/opsview-core/bin/nagconfgen.pl:12423-12426
/commercial/branches/US306-slaves/opsview-core/bin/nagconfgen.pl:9804-9823
/commercial/branches/US307-network-map/opsview-core/bin/nagconfgen.pl:9685-9837
+ /branches/DEV-capside/release-3.9.0/opsview-core/bin/nagconfgen.pl:6365-6370
/branches/DEV-extra-notification-data/opsview-core/bin/nagconfgen.pl:6734-6746
/branches/DEV-odw-calculations/opsview-core/bin/nagconfgen.pl:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/bin/nagconfgen.pl:9778
/branches/DEV-snmp-multi/opsview-core/bin/nagconfgen.pl:7324-7376
/branches/US187/opsview-core/bin/nagconfgen.pl:9403-9479
/branches/US198b/opsview-core/bin/nagconfgen.pl:8875-8994
/branches/US310/opsview-core/bin/nagconfgen.pl:9851-9873
/branches/US539/opsview-core/bin/nagconfgen.pl:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/bin/nagconfgen.pl:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/bin/nagconfgen.pl: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,12615,12645,12653,12663,12744
/branches/enterprise/DEV-professional/opsview-core/bin-protected/nagconfgen.pl:13211
/branches/nagvis-iframe/opsview-core/bin/nagconfgen.pl:9764-9786
/branches/opsview2runtime/opsview-core/bin/nagconfgen.pl:10960-11258
/branches/opsview2runtime_xs/opsview-core/bin/nagconfgen.pl:11279-11303
/branches/us168/opsview-core/bin/nagconfgen.pl: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/opsview-core/bin/nagconfgen.pl:10944,11017
/commercial/branches/BRAN-4.3/opsview-core/bin/nagconfgen.pl:12423-12426
/commercial/branches/US306-slaves/opsview-core/bin/nagconfgen.pl:9804-9823
/commercial/branches/US307-network-map/opsview-core/bin/nagconfgen.pl:9685-9837
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Role.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Role.pm 2013-08-15 14:37:39 UTC (rev 13245)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Role.pm 2013-08-15 14:46:44 UTC (rev 13246)
@@ -54,7 +54,14 @@
after 'auto' => sub {
my ( $self, $c, @args ) = @_;
- my $tabs = [ "Role", "Access", "Objects" ];
+ my $tabs = [
+ 'Role',
+ 'Status Access',
+ 'Status Objects',
+ 'Configuration Access',
+ 'Configuration Objects',
+ 'Administration'
+ ];
if ( $c->stash->{object} && $c->stash->{object}->id < 10 ) {
pop @$tabs;
}
@@ -79,5 +86,18 @@
$c->stash->{list_search_criteria} = { "me.id" => { ">=" => 10 } };
};
+before 'edit' => sub {
+ my ( undef, $c ) = @_;
+
+ # Compose a hash of allowed accesses, so we know what accesses to display.
+ my %allowed_accesses;
+ my $access_rs = $c->model( 'OpsviewSchema::Access' );
+ while ( my $access = $access_rs->next ) {
+ $allowed_accesses{ $access->name } = 1;
+ }
+ $c->stash( allowed_accesses => \%allowed_accesses );
+
+};
+
__PACKAGE__->meta->make_immutable;
1;
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-08-15 14:37:39 UTC (rev 13245)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-08-15 14:46:44 UTC (rev 13246)
@@ -1685,18 +1685,114 @@
msgid "ui.admin.reorder.finish"
msgstr "Finish"
-msgid "ui.admin.role.edit.label.access"
-msgstr "Access"
+msgid "ui.admin.role.edit.administration.adminaccess"
+msgstr "Allows administrative tasks — ADMINACCESS"
+msgid "ui.admin.role.edit.administration.administration_access"
+msgstr "Administration Access"
+
+msgid "ui.admin.role.edit.administration.netflow"
+msgstr "Allows access to NetFlow dashlets — NETFLOW"
+
+msgid "ui.admin.role.edit.administration.passwordsave"
+msgstr "Allows user to save a new password — PASSWORDSAVE"
+
+msgid "ui.admin.role.edit.administration.reloadaccess"
+msgstr "Allows reloading of Opsview — RELOADACCESS"
+
+msgid "ui.admin.role.edit.administration.reportadmin"
+msgstr "Allows access to the reporting module as an administrator — REPORTADMIN"
+
+msgid "ui.admin.role.edit.administration.reportuser"
+msgstr "Allows access to the reporting module as a user — REPORTUSER"
+
+msgid "ui.admin.role.edit.configurationaccess.configuration_access"
+msgstr "Configuration Access"
+
+msgid "ui.admin.role.edit.configurationaccess.configurecontacts"
+msgstr "Allows access to the contacts section of the configuration screens — CONFIGURECONTACTS"
+
+msgid "ui.admin.role.edit.configurationaccess.configurehostgroups"
+msgstr "Allows access to the host groups section of the configuration screens — CONFIGUREHOSTGROUPS"
+
+msgid "ui.admin.role.edit.configurationaccess.configurehosts"
+msgstr "Allows access to the hosts section of the configuration screens — CONFIGUREHOSTS"
+
+msgid "ui.admin.role.edit.configurationaccess.configurekeywords"
+msgstr "Allows access to the keywords section of the configuration screens — CONFIGUREKEYWORDS"
+
+msgid "ui.admin.role.edit.configurationaccess.configurenetflow"
+msgstr "Allows access to the NetFlow section of the configuration screens — CONFIGURENETFLOW"
+
+msgid "ui.admin.role.edit.configurationaccess.configureprofiles"
+msgstr "Allows access to the profiles section of the configuration screens — CONFIGUREPROFILES"
+
+msgid "ui.admin.role.edit.configurationaccess.configureroles"
+msgstr "Allows access to the roles section of the configuration screens — CONFIGUREROLES"
+
+msgid "ui.admin.role.edit.configurationaccess.configuresave"
+msgstr "Allows saving changes — CONFIGURESAVE"
+
+msgid "ui.admin.role.edit.configurationaccess.configuretenancy"
+msgstr "Allows access to the tenancies section of the configuration screens — CONFIGURETENANCY"
+
+msgid "ui.admin.role.edit.configurationaccess.configureview"
+msgstr "Allows access to everything else — CONFIGUREVIEW"
+
+msgid "ui.admin.role.edit.configurationobjects.label.all_monitoringservers"
+msgstr "All monitoring servers"
+
+msgid "ui.admin.role.edit.configurationobjects.label.hostgroups"
+msgstr "Host Groups"
+
+msgid "ui.admin.role.edit.disallow_primary"
+msgstr "You cannot edit this role because it is the primary role for your tenancy"
+
msgid "ui.admin.role.edit.label.description"
msgstr "Description"
-msgid "ui.admin.role.edit.label.hostgroups"
-msgstr "Host Groups"
-
msgid "ui.admin.role.edit.label.name"
msgstr "Name"
+msgid "ui.admin.role.edit.statusaccess.actionall"
+msgstr "Allows setting of acknowledgements, submitting results, rechecks for all object — ACTIONALL"
+
+msgid "ui.admin.role.edit.statusaccess.actionsome"
+msgstr "Allows setting of acknowledgements, submitting results, rechecks for some objects — ACTIONSOME"
+
+msgid "ui.admin.role.edit.statusaccess.downtimeall"
+msgstr "Allows setting of scheduled downtimes for all objects — DOWNTIMEALL"
+
+msgid "ui.admin.role.edit.statusaccess.downtimesome"
+msgstr "Allows setting of scheduled downtimes for some objects — DOWNTIMESOME"
+
+msgid "ui.admin.role.edit.statusaccess.notifysome"
+msgstr "Allows sending of notifications — NOTIFYSOME"
+
+msgid "ui.admin.role.edit.statusaccess.rrdgraphs"
+msgstr "Allows access to graphing page — RRDGRAPHS"
+
+msgid "ui.admin.role.edit.statusaccess.status_access"
+msgstr "Status Access"
+
+msgid "ui.admin.role.edit.statusaccess.testall"
+msgstr "Allows use of the Test Service Check feature for all objects — TESTALL"
+
+msgid "ui.admin.role.edit.statusaccess.testchange"
+msgstr "Allow parameters to be altered before execution — TESTCHANGE"
+
+msgid "ui.admin.role.edit.statusaccess.testsome"
+msgstr "Allows use of the Test Service Check feature for some objects — TESTSOME"
+
+msgid "ui.admin.role.edit.statusaccess.viewall"
+msgstr "Allows viewing of status information for all objects — VIEWALL"
+
+msgid "ui.admin.role.edit.statusaccess.viewportaccess"
+msgstr "Allows access to keywords summary page — VIEWPORTACCESS"
+
+msgid "ui.admin.role.edit.statusaccess.viewsome"
+msgstr "Allows viewing of status information for some objects — VIEWSOME"
+
msgid "ui.admin.role.list.help.cannotDeleteRolesStillUsed"
msgstr "Cannot delete roles which contacts are still using"
@@ -4669,9 +4765,3 @@
msgid "ui.welcome.title"
msgstr "Welcome to Opsview!"
-
-#~ msgid "ui.admin.servicecheck.label.editSnmpTrapRules %1"
-#~ msgstr "Edit SNMP Trap Rules: %1"
-
-#~ msgid "ui.menu.help.licenseValidUntil"
-#~ msgstr "Entitlement valid until %1"
Property changes on: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/DEV-capside/release-3.9.0/opsview-web/lib/Opsview/Web/I18N/i_default.po:6365-6370
/branches/DEV-extra-notification-data/opsview-web/lib/Opsview/Web/I18N/i_default.po:6734-6746
/branches/DEV-odw-calculations/opsview-web/lib/Opsview/Web/I18N/i_default.po:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-web/lib/Opsview/Web/I18N/i_default.po:9778
/branches/DEV-snmp-multi/opsview-web/lib/Opsview/Web/I18N/i_default.po:7324-7376
/branches/US187/opsview-web/lib/Opsview/Web/I18N/i_default.po:9403-9479
/branches/US198b/opsview-web/lib/Opsview/Web/I18N/i_default.po:8875-8994
/branches/US310/opsview-web/lib/Opsview/Web/I18N/i_default.po:9851-9873
/branches/US539/opsview-web/lib/Opsview/Web/I18N/i_default.po:12178-12182
/branches/enterprise/BRAN-3.14/opsview-web/lib/Opsview/Web/I18N/i_default.po:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-web/lib/Opsview/Web/I18N/i_default.po: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,12539-12540,12544,12555,12580,12583,12599-12600,12609,12611,12615,12645,12653,12663,12744,13126-13127,13211
/branches/nagvis-iframe/opsview-web/lib/Opsview/Web/I18N/i_default.po:9764-9786
/branches/opsview2runtime/opsview-web/lib/Opsview/Web/I18N/i_default.po:10960-11258
/branches/opsview2runtime_xs/opsview-web/lib/Opsview/Web/I18N/i_default.po:11279-11303
/branches/us168/opsview-web/lib/Opsview/Web/I18N/i_default.po: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/opsview-web/lib/Opsview/Web/I18N/i_default.po:10944,11017
/commercial/branches/BRAN-4.3/opsview-web/lib/Opsview/Web/I18N/i_default.po:12423-12426
/commercial/branches/US306-slaves/opsview-web/lib/Opsview/Web/I18N/i_default.po:9804-9823
/commercial/branches/US307-network-map/opsview-web/lib/Opsview/Web/I18N/i_default.po:9685-9837
Deleted: trunk/opsview-web/root/admin/role/CONFIGUREHOSTS
===================================================================
--- trunk/opsview-web/root/admin/role/CONFIGUREHOSTS 2013-08-15 14:37:39 UTC (rev 13245)
+++ trunk/opsview-web/root/admin/role/CONFIGUREHOSTS 2013-08-15 14:46:44 UTC (rev 13246)
@@ -1,13 +0,0 @@
-<br/>
-[%
- scrolling_list(
- form_label => c.loc("ui.admin.role.edit.label.hostgroups"),
- name => "hostgroups",
- object_class => "OpsviewSchema::Hostgroups",
- method_arrayref => "by_tree_arrayref",
- help_keyword => "host_groups",
- multiple => 1,
- size => 5,
- );
-
-%]
Deleted: trunk/opsview-web/root/admin/role/tab-access
===================================================================
--- trunk/opsview-web/root/admin/role/tab-access 2013-08-15 14:37:39 UTC (rev 13245)
+++ trunk/opsview-web/root/admin/role/tab-access 2013-08-15 14:46:44 UTC (rev 13246)
@@ -1,22 +0,0 @@
-<div class="panel" id="tab-access">
-[%
-field_label(
- form_label => c.loc("ui.admin.role.edit.label.access"),
- name => "access",
- help_keyword => "access",
-);
-%]
-<table><tr><td>
-[%
-
- checkbox_group(
- name => "accesses",
- object_class => "OpsviewSchema::Access",
- columns => 1,
- class => "checkbox",
- extra_include => 1,
- );
-
-%]
-</td></tr></table>
-</div>
Copied: trunk/opsview-web/root/admin/role/tab-administration (from rev 12600, branches/enterprise/DEV-professional/opsview-web/root/admin/role/tab-administration)
===================================================================
--- trunk/opsview-web/root/admin/role/tab-administration (rev 0)
+++ trunk/opsview-web/root/admin/role/tab-administration 2013-08-15 14:46:44 UTC (rev 13246)
@@ -0,0 +1,69 @@
+<div class="panel" id="tab-administration">
+[%
+access = c.model('OpsviewSchema::Access');
+
+field_label(
+ form_label => c.loc('ui.admin.role.edit.administration.administration_access'),
+ name => 'access',
+ help_keyword => 'access',
+);
+%]
+
+ <table>
+ <tr>
+ <td>
+
+[%
+checkbox(
+ label => c.loc('ui.admin.role.edit.administration.reloadaccess'),
+ checked => object.has_access('RELOADACCESS'),
+ name => 'accesses',
+ value => access.find({ name => 'RELOADACCESS' }).id,
+) IF allowed_accesses.RELOADACCESS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.administration.adminaccess'),
+ checked => object.has_access('ADMINACCESS'),
+ name => 'accesses',
+ value => access.find({ name => 'ADMINACCESS' }).id,
+) IF allowed_accesses.ADMINACCESS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.administration.reportuser'),
+ checked => object.has_access('REPORTUSER'),
+ name => 'accesses',
+ value => access.find({ name => 'REPORTUSER' }).id,
+) IF allowed_accesses.REPORTUSER;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.administration.reportadmin'),
+ checked => object.has_access('REPORTADMIN'),
+ name => 'accesses',
+ value => access.find({ name => 'REPORTADMIN' }).id,
+) IF allowed_accesses.REPORTADMIN;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.administration.netflow'),
+ checked => object.has_access('NETFLOW'),
+ name => 'accesses',
+ value => access.find({ name => 'NETFLOW' }).id,
+) IF allowed_accesses.NETFLOW;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.administration.passwordsave'),
+ checked => object.has_access('PASSWORDSAVE'),
+ name => 'accesses',
+ value => access.find({ name => 'PASSWORDSAVE' }).id,
+) IF allowed_accesses.PASSWORDSAVE;
+%]
+
+ </td>
+ </tr>
+ </table>
+
+</div>
Copied: trunk/opsview-web/root/admin/role/tab-configuration (from rev 12600, branches/enterprise/DEV-professional/opsview-web/root/admin/role/tab-configuration)
===================================================================
--- trunk/opsview-web/root/admin/role/tab-configuration (rev 0)
+++ trunk/opsview-web/root/admin/role/tab-configuration 2013-08-15 14:46:44 UTC (rev 13246)
@@ -0,0 +1,3 @@
+<div class="panel" id="tab-configuration">
+config
+</div>
Copied: trunk/opsview-web/root/admin/role/tab-configurationaccess (from rev 12600, branches/enterprise/DEV-professional/opsview-web/root/admin/role/tab-configurationaccess)
===================================================================
--- trunk/opsview-web/root/admin/role/tab-configurationaccess (rev 0)
+++ trunk/opsview-web/root/admin/role/tab-configurationaccess 2013-08-15 14:46:44 UTC (rev 13246)
@@ -0,0 +1,101 @@
+<div class="panel" id="tab-configurationaccess">
+[%
+access = c.model('OpsviewSchema::Access');
+
+field_label(
+ form_label => c.loc('ui.admin.role.edit.configurationaccess.configuration_access'),
+ name => 'access',
+ help_keyword => 'access',
+);
+%]
+
+ <table>
+ <tr>
+ <td>
+
+[%
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configurehosts'),
+ checked => object.has_access('CONFIGUREHOSTS'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGUREHOSTS' }).id,
+) IF allowed_accesses.CONFIGUREHOSTS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configurekeywords'),
+ checked => object.has_access('CONFIGUREKEYWORDS'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGUREKEYWORDS' }).id,
+) IF allowed_accesses.CONFIGUREKEYWORDS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configureprofiles'),
+ checked => object.has_access('CONFIGUREPROFILES'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGUREPROFILES' }).id,
+) IF allowed_accesses.CONFIGUREPROFILES;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configurehostgroups'),
+ checked => object.has_access('CONFIGUREHOSTGROUPS'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGUREHOSTGROUPS' }).id,
+) IF allowed_accesses.CONFIGUREHOSTGROUPS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configurecontacts'),
+ checked => object.has_access('CONFIGURECONTACTS'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGURECONTACTS' }).id,
+) IF allowed_accesses.CONFIGURECONTACTS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configureroles'),
+ checked => object.has_access('CONFIGUREROLES'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGUREROLES' }).id,
+) IF allowed_accesses.CONFIGUREROLES;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configuretenancy'),
+ checked => object.has_access('CONFIGURETENANCY'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGURETENANCY' }).id,
+) IF allowed_accesses.CONFIGURETENANCY;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configurenetflow'),
+ checked => object.has_access('CONFIGURENETFLOW'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGURENETFLOW' }).id,
+) IF allowed_accesses.CONFIGURENETFLOW;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configureview'),
+ checked => object.has_access('CONFIGUREVIEW'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGUREVIEW' }).id,
+) IF allowed_accesses.CONFIGUREVIEW;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.configurationaccess.configuresave'),
+ checked => object.has_access('CONFIGURESAVE'),
+ name => 'accesses',
+ value => access.find({ name => 'CONFIGURESAVE' }).id,
+) IF allowed_accesses.CONFIGURESAVE;
+%]
+
+ </td>
+ </tr>
+ </table>
+
+</div>
Copied: trunk/opsview-web/root/admin/role/tab-configurationobjects (from rev 12600, branches/enterprise/DEV-professional/opsview-web/root/admin/role/tab-configurationobjects)
===================================================================
--- trunk/opsview-web/root/admin/role/tab-configurationobjects (rev 0)
+++ trunk/opsview-web/root/admin/role/tab-configurationobjects 2013-08-15 14:46:44 UTC (rev 13246)
@@ -0,0 +1,62 @@
+<div class="panel" id="tab-configurationobjects">
+
+<script type="text/_javascript_">
+ function toggleMS() {
+ if ( jQuery171('#all_monitoringservers').prop('checked') ) {
+ jQuery171('#monitoringserversdiv').hide();
+ }
+ else {
+ jQuery171('#monitoringserversdiv').show();
+ }
+ }
+ // Need to call toggleMS() when the Access tab is loaded. I can't seem to
+ // trigger on the Access tab itself, so this will have to do for now.
+ jQuery171('a').click( function() { toggleMS(); } );
+</script>
+
+ <table>
+ <tr>
+ <td>
+
+[%
+scrolling_list(
+ form_label => c.loc('ui.admin.role.edit.configurationobjects.label.hostgroups'),
+ name => 'hostgroups',
+ object_class => 'OpsviewSchema::Hostgroups',
+ method_arrayref => 'by_tree_arrayref',
+ help_keyword => 'host_groups',
+ multiple => 1,
+ size => 10,
+);
+%]
+
+<div>
+ <label class="fields"> </label>
+ [%
+ checkbox(
+ label => c.loc('ui.admin.role.edit.configurationobjects.label.all_monitoringservers'),
+ name => 'all_monitoringservers',
+ object_class => 'OpsviewSchema::Roles',
+ _onclick_ => 'toggleMS()',
+ );
+ %]
+</div>
+
+<div id="monitoringserversdiv">
+ [%
+ scrolling_list(
+ form_label => c.loc('ui.admin.role.edit.configurationobjects.label.monitoringservers'),
+ name => 'monitoringservers',
+ object_class => 'OpsviewSchema::Monitoringservers',
+ help_keyword => 'monitoring_servers',
+ multiple => 1,
+ size => 10,
+ );
+ %]
+</div>
+
+ </td>
+ </tr>
+ </table>
+
+</div>
Deleted: trunk/opsview-web/root/admin/role/tab-objects
===================================================================
--- trunk/opsview-web/root/admin/role/tab-objects 2013-08-15 14:37:39 UTC (rev 13245)
+++ trunk/opsview-web/root/admin/role/tab-objects 2013-08-15 14:46:44 UTC (rev 13246)
@@ -1,13 +0,0 @@
-<div class="panel" id="tab-objects">
-[%
-
- INCLUDE access_objects
- hostgroup_text = c.loc("ui.admin.contact.edit.label.authorisedHostgroups")
- servicegroup_text = c.loc("ui.admin.contact.edit.authorisedServicegroups")
- keyword_text = c.loc("ui.admin.contact.edit.label.authorisedKeywords")
- filter = "all"
- object_prefix = "access_"
- ;
-
-%]
-</div>
Modified: trunk/opsview-web/root/admin/role/tab-role
===================================================================
--- trunk/opsview-web/root/admin/role/tab-role 2013-08-15 14:37:39 UTC (rev 13245)
+++ trunk/opsview-web/root/admin/role/tab-role 2013-08-15 14:46:44 UTC (rev 13246)
@@ -18,5 +18,4 @@
);
%]
-</td></tr></table>
</div>
Copied: trunk/opsview-web/root/admin/role/tab-statusaccess (from rev 12600, branches/enterprise/DEV-professional/opsview-web/root/admin/role/tab-statusaccess)
===================================================================
--- trunk/opsview-web/root/admin/role/tab-statusaccess (rev 0)
+++ trunk/opsview-web/root/admin/role/tab-statusaccess 2013-08-15 14:46:44 UTC (rev 13246)
@@ -0,0 +1,117 @@
+<div class="panel" id="tab-statusaccess">
+[%
+access = c.model('OpsviewSchema::Access');
+
+field_label(
+ form_label => c.loc('ui.admin.role.edit.statusaccess.status_access'),
+ name => 'access',
+ help_keyword => 'access',
+);
+%]
+
+ <table>
+ <tr>
+ <td>
+
+[%
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.viewsome'),
+ checked => object.has_access('VIEWSOME'),
+ name => 'accesses',
+ value => access.find({ name => 'VIEWSOME' }).id,
+) IF allowed_accesses.VIEWSOME;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.viewall'),
+ checked => object.has_access('VIEWALL'),
+ name => 'accesses',
+ value => access.find({ name => 'VIEWALL' }).id,
+) IF allowed_accesses.VIEWALL;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.actionsome'),
+ checked => object.has_access('ACTIONSOME'),
+ name => 'accesses',
+ value => access.find({ name => 'ACTIONSOME' }).id,
+) IF allowed_accesses.ACTIONSOME;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.actionall'),
+ checked => object.has_access('ACTIONALL'),
+ name => 'accesses',
+ value => access.find({ name => 'ACTIONALL' }).id,
+) IF allowed_accesses.ACTIONALL;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.downtimesome'),
+ checked => object.has_access('DOWNTIMESOME'),
+ name => 'accesses',
+ value => access.find({ name => 'DOWNTIMESOME' }).id,
+) IF allowed_accesses.DOWNTIMESOME;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.downtimeall'),
+ checked => object.has_access('DOWNTIMEALL'),
+ name => 'accesses',
+ value => access.find({ name => 'DOWNTIMEALL' }).id,
+) IF allowed_accesses.DOWNTIMEALL;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.testsome'),
+ checked => object.has_access('TESTSOME'),
+ name => 'accesses',
+ value => access.find({ name => 'TESTSOME' }).id,
+) IF allowed_accesses.TESTSOME;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.testall'),
+ checked => object.has_access('TESTALL'),
+ name => 'accesses',
+ value => access.find({ name => 'TESTALL' }).id,
+) IF allowed_accesses.TESTALL;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.testchange'),
+ checked => object.has_access('TESTCHANGE'),
+ name => 'accesses',
+ value => access.find({ name => 'TESTCHANGE' }).id,
+) IF allowed_accesses.TESTCHANGE;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.viewportaccess'),
+ checked => object.has_access('VIEWPORTACCESS'),
+ name => 'accesses',
+ value => access.find({ name => 'VIEWPORTACCESS' }).id,
+) IF allowed_accesses.VIEWPORTACCESS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.rrdgraphs'),
+ checked => object.has_access('RRDGRAPHS'),
+ name => 'accesses',
+ value => access.find({ name => 'RRDGRAPHS' }).id,
+) IF allowed_accesses.RRDGRAPHS;
+
+'<br />' _
+checkbox(
+ label => c.loc('ui.admin.role.edit.statusaccess.notifysome'),
+ checked => object.has_access('NOTIFYSOME'),
+ name => 'accesses',
+ value => access.find({ name => 'NOTIFYSOME' }).id,
+) IF allowed_accesses.NOTIFYSOME;
+%]
+
+ </td>
+ </tr>
+ </table>
+
+</div>
Copied: trunk/opsview-web/root/admin/role/tab-statusobjects (from rev 12600, branches/enterprise/DEV-professional/opsview-web/root/admin/role/tab-statusobjects)
===================================================================
--- trunk/opsview-web/root/admin/role/tab-statusobjects (rev 0)
+++ trunk/opsview-web/root/admin/role/tab-statusobjects 2013-08-15 14:46:44 UTC (rev 13246)
@@ -0,0 +1,11 @@
+<div class="panel" id="tab-statusobjects">
+[%
+INCLUDE access_objects
+ hostgroup_text = c.loc('ui.admin.contact.edit.label.authorisedHostgroups')
+ servicegroup_text = c.loc('ui.admin.contact.edit.authorisedServicegroups')
+ keyword_text = c.loc('ui.admin.contact.edit.label.authorisedKeywords')
+ filter = object.tenancy.id == c.user.role.tenancy.id ? 'valid' : 'all'
+ object_prefix = 'access_'
+ ;
+%]
+</div>
