diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
| commit | 184ffeccb7f4579b481db9b7744aa9baed70562f (patch) | |
| tree | 67c023b029a699a1e727ef6becdc0832e82ea1c5 /app/controllers/track_controller.rb | |
| parent | e44c8b875fd4ad46b954ef9c31bdb6f0366dcb9e (diff) | |
| parent | 79b2f672aeae394a2c195d89b70bda27bb3201a4 (diff) | |
Merge branch 'feature/batch-requests' into rails-3-develop
Conflicts:
config/general.yml-example
spec/factories.rb
Diffstat (limited to 'app/controllers/track_controller.rb')
| -rw-r--r-- | app/controllers/track_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb index 1123903f9..83e05ebbc 100644 --- a/app/controllers/track_controller.rb +++ b/app/controllers/track_controller.rb @@ -116,7 +116,7 @@ class TrackController < ApplicationController # Generic request tracker - set @track_thing before calling def track_set if @user - @existing_track = TrackThing.find_by_existing_track(@user, @track_thing) + @existing_track = TrackThing.find_existing(@user, @track_thing) if @existing_track flash[:notice] = _("You are already following updates about {{track_description}}", :track_description => @track_thing.params[:list_description]) return true |