diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-10-24 09:52:14 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-10-24 09:52:14 +0100 |
| commit | dbacdfe4712010164dde7c0466863b306f7c315d (patch) | |
| tree | 2ddc64cd1eb3651a318abdb3c1d0b661b6a10ecd | |
| parent | e12e5a7685b4ae5dcfeaf931adde2dbb91ef745f (diff) | |
Hide confirmed column if all categories confirmed.
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 3 | ||||
| -rw-r--r-- | templates/web/base/admin/body.html | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 8ec9eeaab..07a6e7f3c 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -482,6 +482,7 @@ sub fetch_contacts : Private { my $contacts = $c->stash->{body}->contacts->search(undef, { order_by => [ 'category' ] } ); $c->stash->{contacts} = $contacts; $c->stash->{live_contacts} = $contacts->search({ deleted => 0 }); + $c->stash->{any_not_confirmed} = $contacts->search({ confirmed => 0 })->count; if ( $c->get_param('text') && $c->get_param('text') eq '1' ) { $c->stash->{template} = 'admin/council_contacts.txt'; diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 3dd562dc4..b63999b2f 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -647,7 +647,8 @@ sub admin_pages { }; # And some that need special permissions if ( $user->is_superuser || $user->has_body_permission_to('category_edit') ) { - $pages->{bodies} = [ _('Bodies'), 1 ]; + my $page_title = $user->is_superuser ? _('Bodies') : _('Categories'); + $pages->{bodies} = [ $page_title, 1 ]; $pages->{body} = [ undef, undef ]; } if ( $user->is_superuser || $user->has_body_permission_to('report_edit') ) { diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index 0b8d3b18c..64b4142de 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -73,7 +73,9 @@ <th colspan=2>[% loc('State') %]</th> <th>[% loc('Last editor') %]</th> <th>[% loc('Note') %]</th> + [% IF any_not_confirmed %] <th>[% loc('Confirm') %]</th> + [% END %] </tr> [% WHILE ( cat = contacts.next ) %] <tr [% IF cat.deleted %]class="is-deleted"[% END %]> @@ -94,16 +96,20 @@ <td>[% cat.editor | html %] <br><small>[% PROCESS format_time time=cat.whenedited %]</small></td> <td>[% cat.note | html %]</td> + [% IF any_not_confirmed %] <td><input type="checkbox" name="confirmed" value="[% cat.category | html %]"></td> + [% END %] </tr> [% END %] </table> + [% IF any_not_confirmed %] <p> <input type="hidden" name="posted" value="update"> <input type="hidden" name="token" value="[% csrf_token %]"> <input type="submit" class="btn" name="Update statuses" value="[% loc('Update statuses') %]"> </p> + [% END %] </form> <p class="fms-admin-info"> |