From f0c1e25cd4774996d6e523bdad73ae3d8f6cabae Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 19 Mar 2014 12:26:18 +0000
Subject: Allow comments to be confirmed with no confirmation

Add never_confirm_updates setting to cobrand that, when set to 0 means
that comments are confirmed with no confirmation step. Essentially
behaves as it would if the user was logged in.
Also add a flag to the flash that indicates the comment was accepted to
you can display a message on the report page if required
---
 perllib/FixMyStreet/App/Controller/Report/Update.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller')

diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index dbfd57e78..bc79cafd3 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -312,7 +312,14 @@ sub save_update : Private {
 
     my $update = $c->stash->{update};
 
-    if ( !$update->user->in_storage ) {
+    if ( $c->cobrand->never_confirm_updates ) {
+        if ( $update->user->in_storage() ) {
+            $update->user->update();
+        } else {
+            $update->user->insert();
+        }
+        $update->confirm();
+    } elsif ( !$update->user->in_storage ) {
         # User does not exist.
         # Store changes in token for when token is validated.
         $c->stash->{token_data} = {
@@ -370,6 +377,7 @@ sub redirect_or_confirm_creation : Private {
         $c->forward( 'signup_for_alerts' );
 
         my $report_uri = $c->cobrand->base_url_for_report( $update->problem ) . $update->problem->url;
+        $c->flash->{comment_created} = 1;
         $c->res->redirect($report_uri);
         $c->detach;
     }
-- 
cgit v1.2.3


From ac7443809e921594c2a5682c49ddf388cdb2598f Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 26 Mar 2014 18:01:55 +0000
Subject: Use flags to indicate type of location error

This makes it a bit easier to override the message in templates which
makes it a bit easier for cobrands.
Leaves the default error message in location_error stash key which
should prevent any existing logic breaking.
---
 perllib/FixMyStreet/App/Controller/Council.pm  | 3 +++
 perllib/FixMyStreet/App/Controller/Location.pm | 1 +
 2 files changed, 4 insertions(+)

(limited to 'perllib/FixMyStreet/App/Controller')

diff --git a/perllib/FixMyStreet/App/Controller/Council.pm b/perllib/FixMyStreet/App/Controller/Council.pm
index 5d95c2538..ceec04027 100644
--- a/perllib/FixMyStreet/App/Controller/Council.pm
+++ b/perllib/FixMyStreet/App/Controller/Council.pm
@@ -69,6 +69,7 @@ sub load_and_check_areas : Private {
             type => $area_types );
     }
     if ($all_areas->{error}) {
+        $c->stash->{location_error_mapit_error} = 1;
         $c->stash->{location_error} = $all_areas->{error};
         return;
     }
@@ -78,6 +79,7 @@ sub load_and_check_areas : Private {
       $c->cobrand->area_check( { all_areas => $all_areas },
         $c->stash->{area_check_action} );
     if ( !$success ) {
+        $c->stash->{location_error_cobrand_check} = 1;
         $c->stash->{location_error} = $error_msg;
         return;
     }
@@ -87,6 +89,7 @@ sub load_and_check_areas : Private {
 
     # If we don't have any areas we can't accept the report
     if ( !scalar keys %$all_areas ) {
+        $c->stash->{location_error_no_areas} = 1;
         $c->stash->{location_error} = _('That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again.');
         return;
     }
diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm
index f103ff7f9..4312b6911 100644
--- a/perllib/FixMyStreet/App/Controller/Location.pm
+++ b/perllib/FixMyStreet/App/Controller/Location.pm
@@ -103,6 +103,7 @@ sub determine_location_from_pc : Private {
     }
 
     # pass errors back to the template
+    $c->stash->{location_error_pc_lookup} = 1;
     $c->stash->{location_error} = $error;
     return;
 }
-- 
cgit v1.2.3