Commit 43317f869e7c318211babe4eb03b432fc29ceed6
1 parent
11ba2339
Exists in
master
and in
1 other branch
Bugfix: inactive ideas showing up in view results
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/controllers/choices_controller.rb
@@ -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) |