@@ -134,13 +134,13 @@ module ActiveRecord end # Creates a WHERE clause for SQL statements, which causes forbidden categories not to be included. Adds AND statement if parameter +true+ is given. - # where_permitted #=> " (NOT hidden OR id IN (1,2,3)) " - # where_permitted #=> " (NOT hidden) " # whenver @@permissions is empty + # where_permitted #=> " (NOT hidden OR hidden=0 OR id IN (1,2,3)) " + # where_permitted #=> " (NOT hidden OR hidden=0) " # whenver @@permissions is empty # where_permitted(true) #=> " AND (NOT hidden OR id IN (1,2,3)) " # where_permitted(true) #=> " AND (NOT hidden) " # whenver @@permissions is empty def self.where_permitted(with_and = false) id_addon = (class_variable_get :@@permissions).size == 0 ? '' : " OR id IN (\#{(class_variable_get :@@permissions).join(',')})" - "\#{with_and ? ' AND' : ''} (#{configuration[:hidden]} IS NULL\#{id_addon}) " + "\#{with_and ? ' AND' : ''} (#{configuration[:hidden]} IS NULL OR #{configuration[:hidden]}=0\#{id_addon}) " end # Returns the +category+ to a given +id+. This is as a replacement for find(id), but it respects permitted/hidden categories. lib/active_record/acts/category.rb @@ -124,11 +124,11 @@ class CategoryTest < Test::Unit::TestCase end def test_where_permitted_sql_query - assert_equal ' (my_hidden IS NULL) ', Category.where_permitted - assert_equal ' AND (my_hidden IS NULL) ', Category.where_permitted(true) + assert_equal ' (my_hidden IS NULL OR my_hidden=0) ', Category.where_permitted + assert_equal ' AND (my_hidden IS NULL OR my_hidden=0) ', Category.where_permitted(true) Category.permissions = [1,2,3] - assert_equal ' (my_hidden IS NULL OR id IN (1,2,3)) ', Category.where_permitted - assert_equal ' AND (my_hidden IS NULL OR id IN (1,2,3)) ', Category.where_permitted(true) + assert_equal ' (my_hidden IS NULL OR my_hidden=0 OR id IN (1,2,3)) ', Category.where_permitted + assert_equal ' AND (my_hidden IS NULL OR my_hidden=0 OR id IN (1,2,3)) ', Category.where_permitted(true) end def test_attr_readonly test/acts_as_category_test.rb 45c6511aa45b906567f6ec1c5d5d46420be14f7d ring0 ring0@ring0-desktop.(none) http://github.com/funkensturm/acts_as_category/commit/958294421ee64700803c92092463db139db8f9ce 958294421ee64700803c92092463db139db8f9ce 2009-07-20T11:44:55-07:00 2009-07-20T11:44:55-07:00 Added 'OR hidden=0' to self.where_permitted. Because field can be NULL, 0, 1 c9ed55aead06aeea8b9218d9ce65054adac935af ring0 ring0@ring0-desktop.(none)