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-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
+ /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,12697,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-core/lib/Opsview/ResultSet/Hosts.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/ResultSet/Hosts.pm 2013-08-15 18:02:53 UTC (rev 13269)
+++ trunk/opsview-core/lib/Opsview/ResultSet/Hosts.pm 2013-08-15 18:04:49 UTC (rev 13270)
@@ -373,4 +373,13 @@
$parents_lookup;
}
+sub restrict_by_role {
+ my ( $self, $role ) = @_;
+ my $hg_paths = [ map { $_->matpath . '%' } $role->hostgroups ];
+ return $self->search(
+ { 'hostgroup.matpath' => { '-like' => $hg_paths }, },
+ { join => "hostgroup", }
+ );
+}
+
1;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Host.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Host.pm 2013-08-15 18:02:53 UTC (rev 13269)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Host.pm 2013-08-15 18:04:49 UTC (rev 13270)
@@ -211,17 +211,18 @@
my ( $self, $c ) = @_;
$c->stash( title_description => $c->loc("ui.admin.host.list.title") );
- my $hg_paths = [ map { $_->matpath . "%" } $c->user->role->hostgroups ];
- $c->stash->{list_search_criteria} =
- { "hostgroup.matpath" => { "-like" => $hg_paths } };
+ my $rs = $c->model( $self->model_name )->restrict_by_role( $c->user->role );
# Due to a warning in DBIx::Class, we've removed the prefetch of
# monitoringservers and monitoringclusters
- $c->stash->{page_attributes} = {
- join => "hostgroup",
- order_by => "me.name",
- prefetch => [ "icon", "hostgroup", ]
- };
+ $rs = $rs->search(
+ {},
+ {
+ order_by => "me.name",
+ prefetch => [ "icon", "hostgroup" ],
+ }
+ );
+ $c->stash( list_rs => $rs );
{
my $stats =
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/REST/Config/Host.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/REST/Config/Host.pm 2013-08-15 18:02:53 UTC (rev 13269)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/REST/Config/Host.pm 2013-08-15 18:04:49 UTC (rev 13270)
@@ -36,15 +36,15 @@
my $rs = $c->stash->{resultset};
# Catalyst magic! Restrict all subsequent calls to only the objects this user is allowed to see based on role
- my $hg_paths = [ map { $_->matpath . "%" } $c->user->role->hostgroups ];
+ $rs = $rs->restrict_by_role( $c->user->role );
$rs = $rs->search(
- { "hostgroup.matpath" => { "-like" => $hg_paths } },
+ {},
{
- join => "hostgroup",
order_by => "me.name",
prefetch => [ "icon", "hostgroup" ]
}
);
+
$c->stash->{resultset} = $rs;
# Need to override here, because otherwise "name" is ambiguous
