kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a problem loading ARCondition in development on second request.

Browse Source
This commit is contained in:
Eric Davis 2011-07-11 18:02:01 -07:00
parent 3b9980b449
commit df0c75c050
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb vendored
View File

@ -19,7 +19,7 @@
Dir[File.expand_path("../redmine/acts/journalized/*.rb", __FILE__)].each{|f| require f } Dir[File.expand_path("../redmine/acts/journalized/*.rb", __FILE__)].each{|f| require f }
require_dependency File.expand_path('lib/ar_condition', Rails.root) require "ar_condition"
module Redmine module Redmine
module Acts module Acts
@ -140,7 +140,7 @@ module Redmine
h[:find_options] ||= {} # in case it is nil h[:find_options] ||= {} # in case it is nil
h[:find_options] = {}.tap do |opts| h[:find_options] = {}.tap do |opts|
cond = ARCondition.new cond = ::ARCondition.new
cond.add(["#{journal_class.table_name}.activity_type = ?", h[:type]]) cond.add(["#{journal_class.table_name}.activity_type = ?", h[:type]])
cond.add(h[:find_options][:conditions]) if h[:find_options][:conditions] cond.add(h[:find_options][:conditions]) if h[:find_options][:conditions]
opts[:conditions] = cond.conditions opts[:conditions] = cond.conditions