Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'origin/hide-problem-test'

  • Loading branch information...
commit c34c5eeaa7122ea2f2078f0051740a78ce821cb0 2 parents 8884d89 + 67944e4
Matthew Somerville dracos authored
2  perllib/FixMyStreet/App/Controller/Report.pm
View
@@ -221,7 +221,7 @@ sub delete :Local :Args(1) {
my $body = $c->user->obj->from_body;
return $c->res->redirect($uri) unless $body;
- return $c->res->redirect($uri) unless $p->bodies->{$body};
+ return $c->res->redirect($uri) unless $p->bodies->{$body->id};
$p->state('hidden');
$p->lastupdate( \'ms_current_timestamp()' );
2  perllib/FixMyStreet/Cobrand/FixMyBarangay.pm
View
@@ -34,7 +34,7 @@ sub only_authed_can_create {
}
# effectively allows barangay staff to hide reports
-sub council_id { return [ 1, 2 ]; }
+sub council_id { return '1,2' ; }
sub areas_on_around {
return [ 1, 2 ];
28 t/cobrand/fixmybarangay.t
View
@@ -90,6 +90,34 @@ ok $dps_report->whensent, 'DPS report marked as sent';
is $dps_report->send_method_used, 'Open311', 'DPS report sent via Open311';
is $dps_report->external_id, 248, 'DPS report has right external ID';
+my $fmb_test_email = 'luz_test_user@example.com';
+my $user = FixMyStreet::App->model('DB::User')->find_or_create( { email => $fmb_test_email, from_body => 1, password => 'fmbsecret' } );
+ok $user, "test user does exist";
+
+$mech->log_out_ok;
+$mech->get_ok( '/report/' . $luz_report->id );
+$mech->content_lacks( "Remove from site" );
+$mech->content_contains( "Report abuse" );
+
+$mech->post_ok('/report/delete/' . $luz_report->id);
+is $mech->uri->path, '/report/' . $luz_report->id, "should redirect to report page, deletion ignored";
+$luz_report->discard_changes;
+is $luz_report->state, 'confirmed', 'should be confirmed';
+
+$user = $mech->log_in_ok($fmb_test_email);
+
+$mech->get_ok( '/report/' . $luz_report->id );
+$mech->content_contains( "Remove from site" );
+$mech->content_lacks( "Report abuse" );
+
+$mech->form_id('remove-from-site-form');
+$mech->submit_form();
+is $mech->uri->path, '/report/' . $luz_report->id, "should redirect to report page, deletion successful";
+$luz_report->discard_changes;
+is $luz_report->state, 'hidden', 'should be hidden';
+
+$mech->delete_user($fmb_test_email);
+
$mech->delete_problems_for_body( 1 );
$mech->delete_problems_for_body( 3 );
2  templates/web/fixmybarangay/report/_message_manager.html
View
@@ -73,7 +73,7 @@
// call this to push the auto-refresh timeout off so it's only triggered
// if there's no activity for a while
function reset_timeout() {
- if (refresh_period && can_refresh) {
+ if (mm_url && refresh_period && can_refresh) {
if (timeout_id) {
clearTimeout(timeout_id);
}
2  templates/web/fixmystreet/report/display.html
View
@@ -28,7 +28,7 @@
<div class="shadow-wrap">
<ul id="key-tools">
[% IF c.user_exists AND c.cobrand.users_can_hide AND c.user.belongs_to_body( c.cobrand.council_id ) %]
- <li><form method="post" action="/report/delete/[% problem.id %]">
+ <li><form method="post" action="/report/delete/[% problem.id %]" id="remove-from-site-form">
<input type="submit" id="key-tool-report-abuse" class="abuse" value="Remove from site">
</form></li>
[% ELSIF c.cobrand.moniker != 'zurich' %]
Please sign in to comment.
Something went wrong with that request. Please try again.