From be55b3690d50cd84de0088b9d91d29e8a2e146ed Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Thu, 5 Apr 2012 16:51:35 +0100 Subject: Editing interface to set send method for council --- perllib/FixMyStreet/App/Controller/Admin.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm') diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 83f77f401..7fc6fe6a5 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -7,6 +7,8 @@ BEGIN { extends 'Catalyst::Controller'; } use POSIX qw(strftime strcoll); use Digest::MD5 qw(md5_hex); +use FixMyStreet::SendReport; + =head1 NAME FixMyStreet::App::Controller::Admin- Catalyst Controller @@ -345,6 +347,9 @@ sub update_contacts : Private { $conf->endpoint( $params{endpoint} ); $conf->jurisdiction( $params{jurisdiction} ); $conf->api_key( $params{api_key} ); + $conf->send_method( $params{send_method} ); + $conf->send_comments( $params{send_comments} ); + $conf->comment_user_id( $params{comment_user_id} ); $conf->update(); @@ -355,6 +360,9 @@ sub update_contacts : Private { $conf->endpoint( $params{endpoint} ); $conf->jurisdiction( $params{jurisdiction} ); $conf->api_key( $params{api_key} ); + $conf->send_method( $params{send_method} ); + $conf->send_comments( $params{send_comments} ); + $conf->comment_user_id( $params{comment_user_id} ); $conf->insert(); @@ -377,6 +385,9 @@ sub display_contacts : Private { $c->stash->{contacts} = $contacts; + my @methods = map { $_ =~ s/FixMyStreet::SendReport:://; $_ } keys %{ FixMyStreet::SendReport->get_senders }; + $c->stash->{send_methods} = \@methods; + my $open311 = $c->model('DB::Open311Conf')->search( { area_id => $area_id } ); -- cgit v1.2.3 From 58f598580a1179fe8d1910087e9562230d230713 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Mon, 23 Apr 2012 11:53:51 +0100 Subject: actually grab params before we use them --- perllib/FixMyStreet/App/Controller/Admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm') diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 7fc6fe6a5..0fa38747a 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -339,7 +339,7 @@ sub update_contacts : Private { } elsif ( $posted eq 'open311' ) { $c->forward('check_token'); - my %params = map { $_ => $c->req->param($_) } qw/open311_id endpoint jurisdiction api_key area_id/; + my %params = map { $_ => $c->req->param($_) } qw/open311_id endpoint jurisdiction api_key area_id send_method send_comments comment_user_id/; if ( $params{open311_id} ) { my $conf = $c->model('DB::Open311Conf')->find( { id => $params{open311_id} } ); -- cgit v1.2.3 From ea4e2e7439af48f7fa4382fa1fe15a1fa2f1c8c7 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Fri, 27 Apr 2012 16:47:11 +0100 Subject: unset comment user if none passed in --- perllib/FixMyStreet/App/Controller/Admin.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm') diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 0fa38747a..b1ef2f0f3 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -349,7 +349,7 @@ sub update_contacts : Private { $conf->api_key( $params{api_key} ); $conf->send_method( $params{send_method} ); $conf->send_comments( $params{send_comments} ); - $conf->comment_user_id( $params{comment_user_id} ); + $conf->comment_user_id( $params{comment_user_id} || undef ); $conf->update(); @@ -362,7 +362,7 @@ sub update_contacts : Private { $conf->api_key( $params{api_key} ); $conf->send_method( $params{send_method} ); $conf->send_comments( $params{send_comments} ); - $conf->comment_user_id( $params{comment_user_id} ); + $conf->comment_user_id( $params{comment_user_id} || undef ); $conf->insert(); -- cgit v1.2.3 From 4b08e5136db27ab0d69d070e77dcd92193f86752 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 1 May 2012 19:17:38 +0100 Subject: store title in users table so we can persist it for bromley --- perllib/FixMyStreet/App/Controller/Admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm') diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index b1ef2f0f3..42e218f61 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -490,7 +490,7 @@ sub search_reports : Path('search_reports') { 'me.id' => $search_n, 'user.email' => { ilike => $like_search }, 'me.name' => { ilike => $like_search }, - title => { ilike => $like_search }, + 'me.title' => { ilike => $like_search }, detail => { ilike => $like_search }, council => { like => $like_search }, cobrand_data => { like => $like_search }, -- cgit v1.2.3 From de24857f0b0c440cad69974c7c1d7f91fbb79a21 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 4 May 2012 20:32:59 +0100 Subject: Dashboard initial start. --- perllib/FixMyStreet/App/Controller/Admin.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm') diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 42e218f61..d11f1645e 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -547,8 +547,7 @@ sub report_edit : Path('report_edit') : Args(1) { } )->first; - $c->detach( '/page_error_404_not_found', - [ _('The requested URL was not found on this server.') ] ) + $c->detach( '/page_error_404_not_found' ) unless $problem; $c->stash->{problem} = $problem; @@ -710,8 +709,7 @@ sub update_edit : Path('update_edit') : Args(1) { } )->first; - $c->detach( '/page_error_404_not_found', - [ _('The requested URL was not found on this server.') ] ) + $c->detach( '/page_error_404_not_found' ) unless $update; $c->forward('get_token'); @@ -1044,7 +1042,7 @@ sub check_token : Private { my ( $self, $c ) = @_; if ( !$c->req->param('token') || $c->req->param('token' ) ne $c->stash->{token} ) { - $c->detach( '/page_error_404_not_found', [ _('The requested URL was not found on this server.') ] ); + $c->detach( '/page_error_404_not_found' ); } return 1; @@ -1214,7 +1212,7 @@ sub check_page_allowed : Private { $page ||= 'summary'; if ( !grep { $_ eq $page } keys %{ $c->stash->{allowed_pages} } ) { - $c->detach( '/page_error_404_not_found', [ _('The requested URL was not found on this server.') ] ); + $c->detach( '/page_error_404_not_found' ); } return 1; -- cgit v1.2.3 From 5accaad402d24f37851d8b85084fda2859b1ae16 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Fri, 11 May 2012 13:17:27 +0100 Subject: add ability to suppress alerts to report creator on comments updated from open311 --- perllib/FixMyStreet/App/Controller/Admin.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm') diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index d11f1645e..d6f613fd3 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -339,7 +339,7 @@ sub update_contacts : Private { } elsif ( $posted eq 'open311' ) { $c->forward('check_token'); - my %params = map { $_ => $c->req->param($_) } qw/open311_id endpoint jurisdiction api_key area_id send_method send_comments comment_user_id/; + my %params = map { $_ => $c->req->param($_) } qw/open311_id endpoint jurisdiction api_key area_id send_method send_comments suppress_alerts comment_user_id/; if ( $params{open311_id} ) { my $conf = $c->model('DB::Open311Conf')->find( { id => $params{open311_id} } ); @@ -349,6 +349,7 @@ sub update_contacts : Private { $conf->api_key( $params{api_key} ); $conf->send_method( $params{send_method} ); $conf->send_comments( $params{send_comments} ); + $conf->suppress_alerts( $params{suppress_alerts} ); $conf->comment_user_id( $params{comment_user_id} || undef ); $conf->update(); @@ -362,6 +363,7 @@ sub update_contacts : Private { $conf->api_key( $params{api_key} ); $conf->send_method( $params{send_method} ); $conf->send_comments( $params{send_comments} ); + $conf->suppress_alerts( $params{suppress_alerts} ); $conf->comment_user_id( $params{comment_user_id} || undef ); $conf->insert(); -- cgit v1.2.3 From 23aa50cd6e1fb77de2d1e3ae8d29a8f8408a7930 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 16 May 2012 15:47:42 +0100 Subject: Fixes and improvements for tests. --- perllib/FixMyStreet/App/Controller/Admin.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm') diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index bbfa8170f..998cb83a8 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -340,7 +340,7 @@ sub update_contacts : Private { } elsif ( $posted eq 'open311' ) { $c->forward('check_token'); - my %params = map { $_ => $c->req->param($_) } qw/open311_id endpoint jurisdiction api_key area_id send_method send_comments suppress_alerts comment_user_id/; + my %params = map { $_ => $c->req->param($_) || '' } qw/open311_id endpoint jurisdiction api_key area_id send_method send_comments suppress_alerts comment_user_id/; if ( $params{open311_id} ) { my $conf = $c->model('DB::Open311Conf')->find( { id => $params{open311_id} } ); @@ -349,8 +349,8 @@ sub update_contacts : Private { $conf->jurisdiction( $params{jurisdiction} ); $conf->api_key( $params{api_key} ); $conf->send_method( $params{send_method} ); - $conf->send_comments( $params{send_comments} ); - $conf->suppress_alerts( $params{suppress_alerts} ); + $conf->send_comments( $params{send_comments} || 0); + $conf->suppress_alerts( $params{suppress_alerts} || 0); $conf->comment_user_id( $params{comment_user_id} || undef ); $conf->update(); @@ -363,8 +363,8 @@ sub update_contacts : Private { $conf->jurisdiction( $params{jurisdiction} ); $conf->api_key( $params{api_key} ); $conf->send_method( $params{send_method} ); - $conf->send_comments( $params{send_comments} ); - $conf->suppress_alerts( $params{suppress_alerts} ); + $conf->send_comments( $params{send_comments} || 0); + $conf->suppress_alerts( $params{suppress_alerts} || 0); $conf->comment_user_id( $params{comment_user_id} || undef ); $conf->insert(); -- cgit v1.2.3