aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/App/Controller/Report.pm31
-rw-r--r--perllib/FixMyStreet/DB/Result/Problem.pm11
-rw-r--r--perllib/FixMyStreet/DB/Result/User.pm2
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm22
-rw-r--r--t/app/controller/report_inspect.t4
-rw-r--r--templates/web/base/report/_inspect.html8
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js13
7 files changed, 70 insertions, 21 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index f7ccddc70..5a1cfbe54 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -308,6 +308,28 @@ sub inspect : Private {
$c->stash->{categories} = $c->forward('/admin/categories_for_point');
$c->stash->{report_meta} = { map { $_->{name} => $_ } @{ $c->stash->{problem}->get_extra_fields() } };
+ my %category_body = map { $_->category => $_->body_id } map { $_->contacts->all } values %{$problem->bodies};
+
+ my @priorities = $c->model('DB::ResponsePriority')->for_bodies($problem->bodies_str_ids)->all;
+ my $priorities_by_category = {};
+ foreach my $pri (@priorities) {
+ my $any = 0;
+ foreach ($pri->contacts->all) {
+ $any = 1;
+ push @{$priorities_by_category->{$_->category}}, $pri->id . '=' . URI::Escape::uri_escape_utf8($pri->name);
+ }
+ if (!$any) {
+ foreach (grep { $category_body{$_} == $pri->body_id } @{$c->stash->{categories}}) {
+ push @{$priorities_by_category->{$_}}, $pri->id . '=' . URI::Escape::uri_escape_utf8($pri->name);
+ }
+ }
+ }
+ foreach (keys %{$priorities_by_category}) {
+ $priorities_by_category->{$_} = join('&', @{$priorities_by_category->{$_}});
+ }
+
+ $c->stash->{priorities_by_category} = $priorities_by_category;
+
if ( $c->get_param('save') ) {
$c->forward('/auth/check_csrf_token');
@@ -355,10 +377,6 @@ sub inspect : Private {
}
}
- if ($c->get_param('priority') && ($permissions->{report_inspect} || $permissions->{report_edit_priority})) {
- $problem->response_priority( $problem->response_priorities->find({ id => $c->get_param('priority') }) );
- }
-
if ( !$c->forward( '/admin/report_edit_location', [ $problem ] ) ) {
# New lat/lon isn't valid, show an error
$valid = 0;
@@ -378,6 +396,11 @@ sub inspect : Private {
$c->forward('/report/new/set_report_extras', [ \@contacts, $param_prefix ]);
}
+ # Updating priority must come after category, in case category has changed (and so might have priorities)
+ if ($c->get_param('priority') && ($permissions->{report_inspect} || $permissions->{report_edit_priority})) {
+ $problem->response_priority( $problem->response_priorities->find({ id => $c->get_param('priority') }) );
+ }
+
if ($valid) {
if ( $reputation_change != 0 ) {
$problem->user->update_reputation($reputation_change);
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index ec1534fe9..203e72fae 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -681,16 +681,7 @@ alphabetical order of name.
sub response_priorities {
my $self = shift;
- return $self->result_source->schema->resultset('ResponsePriority')->search(
- {
- 'me.body_id' => $self->bodies_str_ids,
- 'contact.category' => [ $self->category, undef ],
- },
- {
- order_by => 'name',
- join => { 'contact_response_priorities' => 'contact' },
- }
- );
+ return $self->result_source->schema->resultset('ResponsePriority')->for_bodies($self->bodies_str_ids, $self->category);
}
# returns true if the external id is the council's ref, i.e., useful to publish it
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index 028394795..f4e5144f8 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -268,7 +268,7 @@ sub has_permission_to {
my ($self, $permission_type, $body_ids) = @_;
return 1 if $self->is_superuser;
- return 0 unless $body_ids;
+ return 0 if !$body_ids || (ref $body_ids && !@$body_ids);
my $permission = $self->user_body_permissions->find({
permission_type => $permission_type,
diff --git a/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm b/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
new file mode 100644
index 000000000..aa9c426f4
--- /dev/null
+++ b/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
@@ -0,0 +1,22 @@
+package FixMyStreet::DB::ResultSet::ResponsePriority;
+use base 'DBIx::Class::ResultSet';
+
+use strict;
+use warnings;
+
+sub for_bodies {
+ my ($rs, $bodies, $category) = @_;
+ my $attrs = {
+ 'me.body_id' => $bodies,
+ };
+ if ($category) {
+ $attrs->{'contact.category'} = [ $category, undef ];
+ }
+ $rs->search($attrs, {
+ order_by => 'name',
+ join => { 'contact_response_priorities' => 'contact' },
+ distinct => 1,
+ });
+}
+
+1;
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 56e6e957f..4697cc9d1 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -157,8 +157,8 @@ FixMyStreet::override_config {
$user->user_body_permissions->delete;
$user->user_body_permissions->create({ body => $oxon, permission_type => $test->{type} });
$mech->get_ok("/report/$report_id");
- $mech->contains_or_lacks($test->{priority}, 'Priority');
- $mech->contains_or_lacks($test->{priority}, 'High');
+ $mech->contains_or_lacks($test->{priority}, 'Priority</label>');
+ $mech->contains_or_lacks($test->{priority}, '>High');
$mech->contains_or_lacks($test->{category}, 'Category');
$mech->contains_or_lacks($test->{detailed}, 'Extra details');
$mech->submit_form_ok({
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index ccaa756c5..06c3aab6c 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -52,11 +52,11 @@
[% cat_prefix = category | lower | replace('[^a-z]', '') %]
[% cat_prefix = "category_" _ cat_prefix _ "_" %]
[% IF category == problem.category %]
- <p data-category="[% category | html %]">
+ <p data-category="[% category | html %]" data-priorities="[% priorities_by_category.$category %]">
[% INCLUDE 'report/new/category_extras_fields.html' %]
</p>
- [% ELSIF category_extras.$category.size %]
- <p data-category="[% category | html %]" class="hidden">
+ [% ELSE %]
+ <p data-category="[% category | html %]" class="hidden" data-priorities="[% priorities_by_category.$category %]">
[% INCLUDE 'report/new/category_extras_fields.html' report_meta='' %]
</p>
[% END %]
@@ -107,7 +107,7 @@
<select name="priority" id="problem_priority" class="form-control">
<option value="" [% 'selected' UNLESS problem.response_priority_id %]>-</option>
[% FOREACH priority IN problem.response_priorities %]
- <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id %] [% 'disabled' IF priority.deleted %]>[% priority.name %]</option>
+ <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id %] [% 'disabled' IF priority.deleted %]>[% priority.name | html %]</option>
[% END %]
</select>
</p>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index cd3b127d6..e4c5ba71c 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -654,6 +654,19 @@ $.extend(fixmystreet.set_up, {
selector = "[data-category='" + category + "']";
$("form#report_inspect_form [data-category]:not(" + selector + ")").addClass("hidden");
$("form#report_inspect_form " + selector).removeClass("hidden");
+ // And update the associated priority list
+ var priorities = $("form#report_inspect_form " + selector).data('priorities');
+ var $select = $('#problem_priority'),
+ curr_pri = $select.val();
+ $select.find('option:gt(0)').remove();
+ $.each(priorities.split('&'), function(i, kv) {
+ if (!kv) {
+ return;
+ }
+ kv = kv.split('=', 2);
+ $select.append($('<option>', { value: kv[0], text: decodeURIComponent(kv[1]) }));
+ });
+ $select.val(curr_pri);
});
// The inspect form submit button can change depending on the selected state
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 07:01:51 +0000