Fixed: no :author method error on projects atom feed (#1623).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1653 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-07-12 09:42:18 +00:00
parent 622b6121f4
commit b5444b5fcd
3 changed files with 18 additions and 8 deletions
@@ -25,14 +25,15 @@ module Redmine
      module ClassMethods
        def acts_as_event(options = {})
          return if self.included_modules.include?(Redmine::Acts::Event::InstanceMethods)
-          options[:datetime] ||= :created_on
-          options[:title] ||= :title
-          options[:description] ||= :description
-          options[:author] ||= :author
-          options[:url] ||= {:controller => 'welcome'}
-          options[:type] ||= self.name.underscore.dasherize
+          default_options = { :datetime => :created_on,
+                              :title => :title,
+                              :description => :description,
+                              :author => :author,
+                              :url => {:controller => 'welcome'},
+                              :type => self.name.underscore.dasherize }
+                              
          cattr_accessor :event_options
-          self.event_options = options 
+          self.event_options = default_options.merge(options)
          send :include, Redmine::Acts::Event::InstanceMethods
        end
      end