Commit 11182fcedabfd5a74535daf9201b38a1e48d466a
1 parent
8b5f4fac
Exists in
master
and in
1 other branch
Revert "update remaining find_or_create_by_identfier calls"
This reverts commit 68dd3684bdb68ab97c91e55ea60b9bf0cf1d32dc.
Showing
3 changed files
with
7 additions
and
7 deletions
Show diff stats
app/controllers/choices_controller.rb
| @@ -45,7 +45,7 @@ class ChoicesController < InheritedResources::Base | @@ -45,7 +45,7 @@ class ChoicesController < InheritedResources::Base | ||
| 45 | 45 | ||
| 46 | visitor = current_user.default_visitor | 46 | visitor = current_user.default_visitor |
| 47 | if visitor_identifier | 47 | if visitor_identifier |
| 48 | - visitor = Visitor.find_or_create_by_identifier_and_site_id(visitor_identifier, current_user.id) | 48 | + visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier) |
| 49 | end | 49 | end |
| 50 | params[:choice].merge!(:creator => visitor) | 50 | params[:choice].merge!(:creator => visitor) |
| 51 | 51 | ||
| @@ -68,7 +68,7 @@ class ChoicesController < InheritedResources::Base | @@ -68,7 +68,7 @@ class ChoicesController < InheritedResources::Base | ||
| 68 | 68 | ||
| 69 | end | 69 | end |
| 70 | if visitor_identifier = params[:visitor_identifier] | 70 | if visitor_identifier = params[:visitor_identifier] |
| 71 | - visitor = Visitor.find_or_create_by_identifier_and_site_id(visitor_identifier, current_user.id) | 71 | + visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier) |
| 72 | flag_params.merge!({:visitor_id => visitor.id}) | 72 | flag_params.merge!({:visitor_id => visitor.id}) |
| 73 | end | 73 | end |
| 74 | respond_to do |format| | 74 | respond_to do |format| |
app/models/question.rb
| @@ -237,7 +237,7 @@ class Question < ActiveRecord::Base | @@ -237,7 +237,7 @@ class Question < ActiveRecord::Base | ||
| 237 | end | 237 | end |
| 238 | 238 | ||
| 239 | if params[:with_visitor_stats] | 239 | if params[:with_visitor_stats] |
| 240 | - visitor = Visitor.find_or_create_by_identifier_and_site_id(visitor_identifier, current_user.id) | 240 | + visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier) |
| 241 | result.merge!(:visitor_votes => Vote.find_without_default_scope(:all, :conditions => {:voter_id => visitor, :question_id => self.id}).length) | 241 | result.merge!(:visitor_votes => Vote.find_without_default_scope(:all, :conditions => {:voter_id => visitor, :question_id => self.id}).length) |
| 242 | result.merge!(:visitor_ideas => visitor.choices.count) | 242 | result.merge!(:visitor_ideas => visitor.choices.count) |
| 243 | end | 243 | end |
app/models/user.rb
| @@ -10,12 +10,12 @@ class User < ActiveRecord::Base | @@ -10,12 +10,12 @@ class User < ActiveRecord::Base | ||
| 10 | 10 | ||
| 11 | def create_question(visitor_identifier, question_params) | 11 | def create_question(visitor_identifier, question_params) |
| 12 | logger.info "the question_params are #{question_params.inspect}" | 12 | logger.info "the question_params are #{question_params.inspect}" |
| 13 | - visitor = Visitor.find_or_create_by_identifier_and_site_id(visitor_identifier, self.id) | 13 | + visitor = visitors.find_or_create_by_identifier(visitor_identifier) |
| 14 | question = visitor.questions.create(question_params.merge(:site => self)) | 14 | question = visitor.questions.create(question_params.merge(:site => self)) |
| 15 | end | 15 | end |
| 16 | 16 | ||
| 17 | def create_choice(visitor_identifier, question, choice_params = {}) | 17 | def create_choice(visitor_identifier, question, choice_params = {}) |
| 18 | - visitor = Visitor.find_or_create_by_identifier_and_site_id(visitor_identifier, self.id) | 18 | + visitor = visitors.find_or_create_by_identifier(visitor_identifier) |
| 19 | raise "Question not found" if question.nil? | 19 | raise "Question not found" if question.nil? |
| 20 | 20 | ||
| 21 | #TODO Does this serve a purpose? | 21 | #TODO Does this serve a purpose? |
| @@ -35,7 +35,7 @@ class User < ActiveRecord::Base | @@ -35,7 +35,7 @@ class User < ActiveRecord::Base | ||
| 35 | if visitor_identifier.nil? | 35 | if visitor_identifier.nil? |
| 36 | visitor = default_visitor | 36 | visitor = default_visitor |
| 37 | else | 37 | else |
| 38 | - visitor = Visitor.find_or_create_by_identifier_and_site_id(visitor_identifier, self.id) | 38 | + visitor = visitors.find_or_create_by_identifier(visitor_identifier) |
| 39 | end | 39 | end |
| 40 | visitor.vote_for!(options) | 40 | visitor.vote_for!(options) |
| 41 | end | 41 | end |
| @@ -50,7 +50,7 @@ class User < ActiveRecord::Base | @@ -50,7 +50,7 @@ class User < ActiveRecord::Base | ||
| 50 | if visitor_identifier.nil? | 50 | if visitor_identifier.nil? |
| 51 | visitor = default_visitor | 51 | visitor = default_visitor |
| 52 | else | 52 | else |
| 53 | - visitor = Visitor.find_or_create_by_identifier_and_site_id(visitor_identifier, self.id) | 53 | + visitor = visitors.find_or_create_by_identifier(visitor_identifier) |
| 54 | end | 54 | end |
| 55 | visitor.skip!(options) | 55 | visitor.skip!(options) |
| 56 | end | 56 | end |