jro_apps/redmine Commit - r3244:358e3194d79b

Refactor: Move recipients method into acts_as_event...

Eric Davis -

r3244:358e3194d79b

parent child

Context file:

r3244:358e3194d79b

Collapse all files

app/models/document.rb 0 -7

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Document < ActiveRecord::Base
               belongs_to :project
               belongs_to :category, :class_name => "DocumentCategory", :foreign_key => "category_id"
               acts_as_attachable :delete_permission => :manage_documents
               acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
               acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                             :author => Proc.new {|o| (a = o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC")) ? a.author : nil },
                             :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
               acts_as_activity_provider :find_options => {:include => :project}
               validates_presence_of :project, :title, :category
               validates_length_of :title, :maximum => 60
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_documents, project)
               end
               def after_initialize
                 if new_record?
                   self.category ||= DocumentCategory.default
                 end
               end
               def updated_on
                 unless @updated_on
                   a = attachments.find(:first, :order => 'created_on DESC')
                   @updated_on = (a && a.created_on) || created_on
                 end
                 @updated_on
               end
-              # Returns the mail adresses of users that should be notified
-              def recipients
-                notified = project.notified_users
-                notified.reject! {|user| !visible?(user)}
-                notified.collect(&:mail)
-              end
             end

app/models/message.rb 0 -7

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Message < ActiveRecord::Base
               belongs_to :board
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
               acts_as_attachable
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
               acts_as_searchable :columns => ['subject', 'content'],
                                  :include => {:board => :project},
                                  :project_key => 'project_id',
                                  :date_column => "#{table_name}.created_on"
               acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                             :description => :content,
                             :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} :
                                                                                                                                                    {:id => o.parent_id, :anchor => "message-#{o.id}"})}
               acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]},
                                         :author_key => :author_id
               acts_as_watchable
               attr_protected :locked, :sticky
               validates_presence_of :board, :subject, :content
               validates_length_of :subject, :maximum => 255
               after_create :add_author_as_watcher
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_messages, project)
               end
               def validate_on_create
                 # Can not reply to a locked topic
                 errors.add_to_base 'Topic is locked' if root.locked? && self != root
               end
               def after_create
                 if parent
                   parent.reload.update_attribute(:last_reply_id, self.id)
                 end
                 board.reset_counters!
               end
               def after_update
                 if board_id_changed?
                   Message.update_all("board_id = #{board_id}", ["id = ? OR parent_id = ?", root.id, root.id])
                   Board.reset_counters!(board_id_was)
                   Board.reset_counters!(board_id)
                 end
               end
               def after_destroy
                 board.reset_counters!
               end
               def sticky=(arg)
                 write_attribute :sticky, (arg == true || arg.to_s == '1' ? 1 : 0)
               end
               def sticky?
                 sticky == 1
               end
               def project
                 board.project
               end
               def editable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:edit_messages, project) || (self.author == usr && usr.allowed_to?(:edit_own_messages, project)))
               end
               def destroyable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
               end
-              # Returns the mail adresses of users that should be notified
-              def recipients
-                notified = project.notified_users
-                notified.reject! {|user| !visible?(user)}
-                notified.collect(&:mail)
-              end
               private
               def add_author_as_watcher
                 Watcher.create(:watchable => self.root, :user => author)
               end
             end

app/models/news.rb 0 -7

             # Redmine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class News < ActiveRecord::Base
               belongs_to :project
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
               validates_presence_of :title, :description
               validates_length_of :title, :maximum => 60
               validates_length_of :summary, :maximum => 255
               acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project
               acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
               acts_as_activity_provider :find_options => {:include => [:project, :author]},
                                         :author_key => :author_id
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_news, project)
               end
-              # Returns the mail adresses of users that should be notified
-              def recipients
-                notified = project.notified_users
-                notified.reject! {|user| !visible?(user)}
-                notified.collect(&:mail)
-              end
               # returns latest news for projects visible by user
               def self.latest(user = User.current, count = 5)
                 find(:all, :limit => count, :conditions => Project.allowed_to_condition(user, :view_news), :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
               end
             end

vendor/plugins/acts_as_event/lib/acts_as_event.rb +7 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module Acts
                 module Event
                   def self.included(base)
                     base.extend ClassMethods
                   end
                   module ClassMethods
                     def acts_as_event(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Event::InstanceMethods)
                       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 = default_options.merge(options)
                       send :include, Redmine::Acts::Event::InstanceMethods
                     end
                   end
                   module InstanceMethods
                     def self.included(base)
                       base.extend ClassMethods
                     end
                     %w(datetime title description author type).each do |attr|
                       src = <<-END_SRC
                         def event_#{attr}
                           option = event_options[:#{attr}]
                           if option.is_a?(Proc)
                             option.call(self)
                           elsif option.is_a?(Symbol)
                             send(option)
                           else
                             option
                           end
                         end
                       END_SRC
                       class_eval src, __FILE__, __LINE__
                     end
                     def event_date
                       event_datetime.to_date
                     end
                     def event_url(options = {})
                       option = event_options[:url]
                       (option.is_a?(Proc) ? option.call(self) : send(option)).merge(options)
                     end
+                    # Returns the mail adresses of users that should be notified
+                    def recipients
+                      notified = project.notified_users
+                      notified.reject! {|user| !visible?(user)}
+                      notified.collect(&:mail)
+                    end
                     module ClassMethods
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages