kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes acts_as_event with a String as url option (#5343). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3681 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-04-18 10:00:11 +00:00
parent 3bf6790826
commit 760c933bd7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vendor/plugins/acts_as_event/lib/acts_as_event.rb vendored
View File

@ -65,7 +65,15 @@ module Redmine
def event_url(options = {}) def event_url(options = {})
option = event_options[:url] option = event_options[:url]
(option.is_a?(Proc) ? option.call(self) : send(option)).merge(options) if option.is_a?(Proc)
option.call(self)
elsif option.is_a?(Hash)
option.merge(options)
elsif option.is_a?(Symbol)
send(option)
else
option
end
end end
# Returns the mail adresses of users that should be notified # Returns the mail adresses of users that should be notified