Bugfix: inactive ideas showing up in view results

Dhruv Kapadia
1 parent 11ba2339
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/controllers/choices_controller.rb
@@ -16,7 +16,7 @@ class ChoicesController &lt; InheritedResources::Base
 		      :order => 'score DESC', 
 		      :include => :item}
-      find_options[:conditions].merge!(:active => true) if params[:include_inactive]
+      find_options[:conditions].merge!(:active => true) unless params[:include_inactive]
       find_options.merge!(:offset => params[:offset]) if params[:offset]
       @choices = Choice.find(:all, find_options)
	@@ -16,7 +16,7 @@ class ChoicesController < InheritedResources::Base		@@ -16,7 +16,7 @@ class ChoicesController < InheritedResources::Base
16	:order => 'score DESC',	16	:order => 'score DESC',
17	:include => :item}	17	:include => :item}
18		18
19	- find_options[:conditions].merge!(:active => true) if params[:include_inactive]	19	+ find_options[:conditions].merge!(:active => true) unless params[:include_inactive]
20	find_options.merge!(:offset => params[:offset]) if params[:offset]	20	find_options.merge!(:offset => params[:offset]) if params[:offset]
21		21
22	@choices = Choice.find(:all, find_options)	22	@choices = Choice.find(:all, find_options)