shoring up the 'active prompts only' logic

Pius Uzamere
1 parent 3fe8a232
Showing 1 changed file with 6 additions and 4 deletions Show diff stats
app/models/question.rb
@@ -24,16 +24,18 @@ class Question &lt; ActiveRecord::Base
    def picked_prompt
      pc = self.prompts_count < 1 ? 2 : self.prompts_count
      begin
-       return p = prompts.find(rand(pc-1) + prompts.first.id)
-     end until p.active?
+       @p = prompts.find(rand(pc-1) + prompts.first.id)
+     end until @p.active?
+     return @p
    end
  
  
    def picked_prompt_id
      pc = self.prompts_count < 1 ? 2 : self.prompts_count
      begin
-       return i = rand(pc-1) + prompts.first.id #try caching this first prompt value at some point
-     end until prompts.find(i).active?
+       @i = rand(pc-1) + prompts.first.id #try caching this first prompt value at some point
+     end until prompts.find(@i).active?
+     return @i
    end
  
    def left_choice_text(prompt = nil)
...	...	@@ -24,16 +24,18 @@ class Question < ActiveRecord::Base
24	24	def picked_prompt
25	25	pc = self.prompts_count < 1 ? 2 : self.prompts_count
26	26	begin
27		- return p = prompts.find(rand(pc-1) + prompts.first.id)
28		- end until p.active?
	27	+ @p = prompts.find(rand(pc-1) + prompts.first.id)
	28	+ end until @p.active?
	29	+ return @p
29	30	end
30	31
31	32
32	33	def picked_prompt_id
33	34	pc = self.prompts_count < 1 ? 2 : self.prompts_count
34	35	begin
35		- return i = rand(pc-1) + prompts.first.id #try caching this first prompt value at some point
36		- end until prompts.find(i).active?
	36	+ @i = rand(pc-1) + prompts.first.id #try caching this first prompt value at some point
	37	+ end until prompts.find(@i).active?
	38	+ return @i
37	39	end
38	40
39	41	def left_choice_text(prompt = nil)
...	...