aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md5
-rw-r--r--perllib/FixMyStreet/App/Controller/Report.pm2
-rw-r--r--t/app/controller/report_inspect.t7
-rw-r--r--templates/web/base/report/_inspect.html2
-rw-r--r--templates/web/fixmystreet.com/about/professional.html2
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js3
-rw-r--r--web/cobrands/fixmystreet/staff.js3
7 files changed, 18 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72aa3dd07..813c6458f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
* Unreleased
- Admin improvements:
- Highlight current shortlisted user in list tooltip.
+ - Bugfixes:
+ - Set up action scheduled field when report loaded. #1789
+ - Stop errors from JS validator due to form in form.
+ - Stop update form toggle causing report submission.
+ - Update map size if an extra column has appeared.
* v2.1.1 (3rd August 2017)
- Email improvements:
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 72cb0814c..b31877839 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -452,10 +452,10 @@ sub inspect : Private {
if ($c->user->has_body_permission_to('planned_reports')) {
my $categories = join(',', @{ $c->user->categories });
my $params = {
- filter_category => $categories,
lat => $problem->latitude,
lon => $problem->longitude,
};
+ $params->{filter_category} = $categories if $categories;
$redirect_uri = $c->uri_for( "/around", $params );
}
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 1a3cc0fbc..447e28028 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -30,6 +30,7 @@ my $report3_id = $report3->id;
my $user = $mech->log_in_ok('test@example.com');
+$user->set_extra_metadata('categories', [ $contact->id ]);
$user->update( { from_body => $oxon } );
FixMyStreet::override_config {
@@ -69,6 +70,7 @@ FixMyStreet::override_config {
subtest "test inspect & instruct submission" => sub {
$user->user_body_permissions->create({ body => $oxon, permission_type => 'report_instruct' });
+ $user->user_body_permissions->create({ body => $oxon, permission_type => 'planned_reports' });
$report->state('confirmed');
$report->update;
my $reputation = $report->user->get_extra_metadata("reputation");
@@ -81,6 +83,8 @@ FixMyStreet::override_config {
is $report->comments->first->text, "This is a public update.", 'Update was created';
is $report->get_extra_metadata('inspected'), 1, 'report marked as inspected';
is $report->user->get_extra_metadata('reputation'), $reputation, "User reputation wasn't changed";
+ $user->unset_extra_metadata('categories');
+ $user->update;
};
subtest "test update is required when instructing" => sub {
@@ -100,8 +104,9 @@ FixMyStreet::override_config {
$mech->get_ok("/report/$report_id");
$mech->submit_form_ok({ button => 'save', with_fields => { latitude => 55, longitude => -2 } });
$mech->content_contains('Invalid location');
- $mech->submit_form_ok({ button => 'save', with_fields => { latitude => 51.754926, longitude => -1.256179 } });
+ $mech->submit_form_ok({ button => 'save', with_fields => { latitude => 51.754926, longitude => -1.256179, include_update => undef } });
$mech->content_lacks('Invalid location');
+ $user->user_body_permissions->search({ body_id => $oxon->id, permission_type => 'planned_reports' })->delete;
};
subtest "test duplicate reports are shown" => sub {
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 8745e5c31..bf57cb858 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -6,7 +6,7 @@
[% INCLUDE 'errors.html' %]
- <form id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id ) %]">
+ <form id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id ) %]" class="validate">
<div class="inspect-section">
<p>
diff --git a/templates/web/fixmystreet.com/about/professional.html b/templates/web/fixmystreet.com/about/professional.html
index b6690a6d2..0978d19bc 100644
--- a/templates/web/fixmystreet.com/about/professional.html
+++ b/templates/web/fixmystreet.com/about/professional.html
@@ -49,7 +49,7 @@
<input type="hidden" name="extra.referer" value="[% c.req.headers.referer | html %]">
<input type="hidden" name="subject" value="Demo site request">
<input type="hidden" name="message" value="This visitor was sent a link to demo.fixmystreet.com">
- <input type="hidden" name="recipient" value="enquiries">
+ <input type="hidden" name="recipient" value="bettercities">
<input type="hidden" name="dest" value="from_council">
<input type="hidden" name="success_url" value="https://demo.fixmystreet.com">
<input type="submit" value="Let me in" class="btn">
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 9368d8cc9..4d38c81d2 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1042,6 +1042,7 @@ fixmystreet.display = {
$('body').addClass('with-actions');
fixmystreet.run(fixmystreet.set_up.report_page_inspect);
fixmystreet.run(fixmystreet.set_up.manage_duplicates);
+ fixmystreet.run(fixmystreet.set_up.action_scheduled_raise_defect);
} else {
$sideReport.appendTo('#map_sidebar');
}
@@ -1052,7 +1053,7 @@ fixmystreet.display = {
fixmystreet.page = 'report';
fixmystreet.mobile_reporting.remove_ui();
- if ($('html').hasClass('mobile') && fixmystreet.map.updateSize) {
+ if (fixmystreet.map.updateSize && ($twoColReport.length || $('html').hasClass('mobile'))) {
fixmystreet.map.updateSize();
}
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 2a1c6a8f4..2f9de6c7e 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -312,7 +312,8 @@ $.extend(fixmystreet.set_up, {
$updateFormH2.hide().nextAll().hide();
$updateFormBtn.addClass('btn btn--provide-update');
$updateFormBtn.text( $updateFormH2.text() );
- $updateFormBtn.on('click', function(){
+ $updateFormBtn.on('click', function(e) {
+ e.preventDefault();
$updateFormH2.nextAll().toggle();
});
},
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 19:53:07 +0000