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,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,12614-12615,12618,12624,12630-12631,12633,12643,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-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,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,12614-12615,12618,12624,12630-12631,12633,12643,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-core/lib/Opsview/ResultSet/Roles.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/ResultSet/Roles.pm 2013-08-15 15:00:23 UTC (rev 13250)
+++ trunk/opsview-core/lib/Opsview/ResultSet/Roles.pm 2013-08-15 15:03:51 UTC (rev 13251)
@@ -57,16 +57,31 @@
$object->remove_objects_from_notificationprofiles;
}
-sub search_non_system_roles {
+# This orders the roles based on system ones which cannot be deleted first
+sub search_ordered_roles {
return shift->search(
- { id => { ">=" => 10 } },
- { order_by => [ "priority", "name" ] }
+ {},
+ {
+ "+select" => [
+ \"
+ IF( me.id < 10,
+ me.id,
+ 10000
+ ) AS sysid
+ "
+ ],
+ order_by => [qw(sysid me.priority name)],
+ }
);
}
+sub search_non_system_roles {
+ return shift->search( { "me.id" => { ">=" => 10 } } );
+}
+
sub actual_roles_arrayref {
my $self = shift;
- my @objects = $self->search_non_system_roles;
+ my @objects = $self->search_ordered_roles->search_non_system_roles;
\@objects;
}
Modified: trunk/opsview-core/t/942roles.t
===================================================================
--- trunk/opsview-core/t/942roles.t 2013-08-15 15:00:23 UTC (rev 13250)
+++ trunk/opsview-core/t/942roles.t 2013-08-15 15:03:51 UTC (rev 13251)
@@ -57,9 +57,15 @@
);
@a = sort map { $_->username } ( $rs->all_with_access("ACTIONSOME") );
-is_deeply( \@a,
- [ "nonadmin", "onlyunknowns", "somehosts", "testviewallchangesome" ]
-);
+is_deeply(
+ \@a,
+ [
+ "customeraadmin", "customerb1",
+ "customerb2", "nonadmin",
+ "onlyunknowns", "somehosts",
+ "testviewallchangesome"
+ ]
+) || diag explain \@a;
my $roles = $schema->resultset( "Roles" );
my @actual_roles = map { $_->name } @{ $roles->actual_roles_arrayref };
@@ -77,10 +83,14 @@
'demorole',
'Keywordonly',
'View some, change none, no notify',
- "View some, change none, no notify - viewsomechangenonewonotify"
+ "View some, change none, no notify - viewsomechangenonewonotify",
+ "CustomerA",
+ "CustomerA operator",
+ "CustomerA manager",
+ "Customer B",
],
"Got non-system roles"
-) || diag( Data::Dump::dump( \@actual_roles ) );
+) || diag explain \@actual_roles;
# These tests make changes to test db
$schema->resultset("Access")->search( { name => "VIEWALL" } )->delete_all;
@@ -110,7 +120,7 @@
# This needs to be before the update below as we add the monitoring server in
my $ms = $schema->resultset("Monitoringservers")->find(2);
-is( $ms->roles->count, 1 );
+is( $ms->roles->count, 4 );
eval { $ms->delete };
like(
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Keyword.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Keyword.pm 2013-08-15 15:00:23 UTC (rev 13250)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Keyword.pm 2013-08-15 15:03:51 UTC (rev 13251)
@@ -62,7 +62,9 @@
shift->next::method(@_);
$c->stash->{choosebox_roles} =
$c->model("OpsviewSchema::Roles")
- ->search_non_system_roles->search( { all_keywords => { '!=' => 1 } } );
+ ->search_ordered_roles->search_non_system_roles->search(
+ { all_keywords => { '!=' => 1 } }
+ );
$c->stash->{all_keyword_roles} =
[ $c->model("OpsviewSchema::Roles")->search( { all_keywords => 1 } ) ];
}
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Role.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Role.pm 2013-08-15 15:00:23 UTC (rev 13250)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Role.pm 2013-08-15 15:03:51 UTC (rev 13251)
@@ -70,11 +70,8 @@
my ( $self, $c ) = @_;
$c->stash( title_description => $c->loc("ui.admin.role.list.title") );
- # Order the roles based on system ones which cannot be deleted first
- $c->stash->{page_attributes} = {
- "+select" => [ \"IF(id<10,id,10+priority) AS sysid" ],
- order_by => "sysid",
- };
+ my $rs = $c->model( $self->model_name )->search_ordered_roles;
+ $c->stash( list_rs => $rs );
};
before 'reorder' => sub {
Modified: trunk/opsview-web/lib/Opsview/Web/ControllerBase/Admin.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/ControllerBase/Admin.pm 2013-08-15 15:00:23 UTC (rev 13250)
+++ trunk/opsview-web/lib/Opsview/Web/ControllerBase/Admin.pm 2013-08-15 15:03:51 UTC (rev 13251)
@@ -328,7 +328,13 @@
}
}
if ( $c->stash->{is_dbix_class} ) {
- $it = $c->stash->{model_class}->search(
+ if ( $c->stash->{list_rs} ) {
+ $it = $c->stash->{list_rs};
+ }
+ else {
+ $it = $c->stash->{model_class};
+ }
+ $it = $it->search(
$search,
{
page => $req_page,
Property changes on: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
___________________________________________________________________
Modified: 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,12614-12615,12618,12624,12630-12631,12633,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
+ /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,12614-12615,12618,12624,12630-12631,12633,12643,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
