diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-03-30 16:00:02 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-30 16:00:02 +0100 |
| commit | f24cc98afa25ad6010ae5316eecc15dfdb3fa79b (patch) | |
| tree | c32fecb16bb2097da7dfdf90e6915fce0bf1a425 /app/controllers/admin_track_controller.rb | |
| parent | 823e58dc69960c600230b10604a0051359173f85 (diff) | |
| parent | 3c0604cf900ad274d8f6ff421d39854ccbf4b6af (diff) | |
Merge branch 'release/0.21'0.21.0.0
Conflicts:
locale/cy/app.po
locale/es_NI/app.po
locale/hr/app.po
locale/is_IS/app.po
locale/sr@latin/app.po
Diffstat (limited to 'app/controllers/admin_track_controller.rb')
| -rw-r--r-- | app/controllers/admin_track_controller.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/admin_track_controller.rb b/app/controllers/admin_track_controller.rb index 085c9c6cc..63ee5c12e 100644 --- a/app/controllers/admin_track_controller.rb +++ b/app/controllers/admin_track_controller.rb @@ -5,7 +5,8 @@ # Email: hello@mysociety.org; WWW: http://www.mysociety.org/ class AdminTrackController < AdminController - def list + + def index @query = params[:query] if @query track_things = TrackThing.where(["lower(track_query) like lower('%'||?||'%')", @query]) @@ -13,7 +14,14 @@ class AdminTrackController < AdminController track_things = TrackThing end @admin_tracks = track_things.paginate :order => "created_at desc", :page => params[:page], :per_page => 100 - @popular = ActiveRecord::Base.connection.select_all("select count(*) as count, title, info_request_id from track_things join info_requests on info_request_id = info_requests.id where info_request_id is not null group by info_request_id, title order by count desc limit 10;") + @popular = ActiveRecord::Base.connection.select_all("select count(*) as count, title, info_request_id from track_things join info_requests on info_request_id = info_requests.id where info_request_id is not null group by info_request_id, title order by count desc limit 10;") + end + + def destroy + track_thing = TrackThing.find(params[:id].to_i) + track_thing.destroy + flash[:notice] = 'Track destroyed' + redirect_to admin_user_url(track_thing.tracking_user) end private |