Ticket #4084: 6549_quote_scope_condition_value.diff

File 6549_quote_scope_condition_value.diff, 1.6 kB (added by josh, 1 year ago)

activerecord/lib/active_record/acts/list.rb

old	new
36	36
37	37	configuration[:scope] = "#{configuration[:scope]}_id".intern if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
38	38
39		if configuration[:scope].is_a?(Symbol)
40		scope_condition_method = %(
41		def scope_condition
42		if #{configuration[:scope].to_s}.nil?
43		"#{configuration[:scope].to_s} IS NULL"
44		else
45		"#{configuration[:scope].to_s} = \#{#{configuration[:scope].to_s}}"
46		end
47		end
48		)
49		else
50		scope_condition_method = "def scope_condition() \"#{configuration[:scope]}\" end"
	39	define_method :scope_condition do
	40	condition = configuration[:scope]
	41	return eval("\"#{condition}\"") unless condition.is_a?(Symbol)
	42	value = send(condition)
	43	value.nil? ? "#{condition} IS NULL" : "#{condition} = #{quote_value(value)}"
51	44	end
52	45
53	46	class_eval <<-EOV
…	…
60	53	def position_column
61	54	'#{configuration[:column]}'
62	55	end
63
64		#{scope_condition_method}
65
	56
66	57	after_destroy :remove_from_list
67	58	before_create :add_to_list_bottom
68	59	EOV