Merge tag 'v2.0.4' into fiksgatami-dev

1 files changed, 5 insertions, 4 deletions

diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index c22224307..e0b6b5298 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -42,13 +42,13 @@ sub restriction {
 
 sub problems_restriction {
     my ($self, $rs) = @_;
-    return $rs if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return $rs if FixMyStreet->staging_flag('skip_checks');
     return $rs->to_body($self->council_id);
 }
 
 sub updates_restriction {
     my ($self, $rs) = @_;
-    return $rs if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return $rs if FixMyStreet->staging_flag('skip_checks');
     return $rs->to_body($self->council_id);
 }
 
@@ -76,7 +76,7 @@ sub users_restriction {
 
     my $or_query = [
         from_body => $self->council_id,
-        id => [ { -in => $problem_user_ids }, { -in => $update_user_ids } ],
+        'me.id' => [ { -in => $problem_user_ids }, { -in => $update_user_ids } ],
     ];
     if ($self->can('admin_user_domain')) {
         my $domain = $self->admin_user_domain;
@@ -105,7 +105,7 @@ sub enter_postcode_text {
 sub area_check {
     my ( $self, $params, $context ) = @_;
 
-    return 1 if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return 1 if FixMyStreet->staging_flag('skip_checks');
 
     my $councils = $params->{all_areas};
     my $council_match = defined $councils->{$self->council_id};
@@ -200,6 +200,7 @@ sub available_permissions {
 
     my $perms = $self->next::method();
     $perms->{Problems}->{contribute_as_body} = "Create reports/updates as " . $self->council_name;
+    $perms->{Problems}->{view_body_contribute_details} = "See user detail for reports created as " . $self->council_name;
     $perms->{Users}->{user_assign_areas} = "Assign users to areas in " . $self->council_name;
 
     return $perms;