diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin_track_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/application.rb | 4 | ||||
| -rw-r--r-- | app/controllers/general_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/app/controllers/admin_track_controller.rb b/app/controllers/admin_track_controller.rb index fee2911b3..af0a6c0e7 100644 --- a/app/controllers/admin_track_controller.rb +++ b/app/controllers/admin_track_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: admin_track_controller.rb,v 1.1 2008-05-16 18:28:07 francis Exp $ +# $Id: admin_track_controller.rb,v 1.2 2008-05-21 10:51:24 francis Exp $ class AdminTrackController < ApplicationController layout "admin" @@ -16,10 +16,6 @@ class AdminTrackController < ApplicationController :conditions => @query.nil? ? nil : ["track_query ilike '%'||?||'%'", @query ] end - def show - @track_thing = TrackThing.find(params[:id]) - end - private end diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 6decd6591..fffb32871 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application.rb,v 1.45 2008-05-15 17:40:43 francis Exp $ +# $Id: application.rb,v 1.46 2008-05-21 10:51:24 francis Exp $ class ApplicationController < ActionController::Base @@ -134,7 +134,7 @@ class ApplicationController < ActionController::Base elsif sortby == 'newest' return ['created_at', false] elsif sortby == 'described' - return ['rss_at', false] # use this for RSS + return ['described_at', false] # use this for some RSS else raise "Unknown sort order " + @sortby end diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 5853f4ba3..7802b701e 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -5,7 +5,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: general_controller.rb,v 1.27 2008-05-19 23:28:39 francis Exp $ +# $Id: general_controller.rb,v 1.28 2008-05-21 10:51:24 francis Exp $ class GeneralController < ApplicationController @@ -57,6 +57,8 @@ class GeneralController < ApplicationController # in config/routes.rb for comments. combined = params[:combined] sortby = nil + # XXX currently /described isn't linked to anywhere, just used in RSS and for /list/successful + # This is because it's confusingly different from /newest - but still useful for power users. if combined.size > 1 and (combined[-1] == 'newest' or combined[-1] == 'described') sortby = combined[-1] combined = combined[0..-2] diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 698a6a576..0d0ba505b 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_controller.rb,v 1.90 2008-05-19 23:28:39 francis Exp $ +# $Id: request_controller.rb,v 1.91 2008-05-21 10:51:24 francis Exp $ class RequestController < ApplicationController @@ -58,7 +58,7 @@ class RequestController < ApplicationController sortby = "newest" @track_thing = TrackThing.create_track_for_all_new_requests elsif @view == 'successful' - @title = "Recent successful responses" + @title = "Recently successful responses" query = 'variety:response (status:successful OR status:partially_successful)' sortby = "described" @track_thing = TrackThing.create_track_for_all_successful_requests |