Adds email notifications support for news comments (#2074).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5003 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index e7c643e902ec13ead50a81baba4ba126c1e53615..bc7eabb58c686fe583d77ad7999ed6f952cab962 100644 (file)
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  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
@@ -25,6 +25,8 @@ class NewsController < ApplicationController
   before_filter :find_optional_project, :only => :index
   accept_key_auth :index
   
+  helper :watchers
+  
   def index
     case params[:format]
     when 'xml', 'json'

diff --git a/app/models/comment_observer.rb b/app/models/comment_observer.rb
new file mode 100644 (file)
index 0000000..fc00894
--- /dev/null
+++ b/app/models/comment_observer.rb
@@ -0,0 +1,24 @@
+# Redmine - project management software
+# Copyright (C) 2006-2011  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 CommentObserver < ActiveRecord::Observer
+  def after_create(comment)
+    if comment.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')
+      Mailer.deliver_news_comment_added(comment)
+    end
+  end
+end

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2d18a2c76125a12eb4384481c2d07a26a5ea8f4e..69a620beed9ef205be89069d8de7e5724eeadbf7 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  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
@@ -148,6 +148,24 @@ class Mailer < ActionMailer::Base
          :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
     render_multipart('news_added', body)
   end
+  
+  # Builds a tmail object used to email recipients of a news' project when a news comment is added.
+  #
+  # Example:
+  #   news_comment_added(comment) => tmail object
+  #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
+  def news_comment_added(comment)
+    news = comment.commented
+    redmine_headers 'Project' => news.project.identifier
+    message_id comment
+    recipients news.recipients
+    cc news.watcher_recipients
+    subject "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    body :news => news,
+         :comment => comment,
+         :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
+    render_multipart('news_comment_added', body)
+  end
 
   # Builds a tmail object used to email the recipients of the specified message that was posted. 
   #

diff --git a/app/models/news.rb b/app/models/news.rb
index 00729f06c3e02028099cdf7df3c0b3133cedcb3f..7f8c7310768f32b46798b3b5010fb3aaf3f528ff 100644 (file)
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2008  Jean-Philippe Lang
+# Copyright (C) 2006-2011  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
@@ -28,6 +28,9 @@ class News < ActiveRecord::Base
   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
+  acts_as_watchable
+  
+  after_create :add_author_as_watcher
   
   named_scope :visible, lambda {|*args| { 
     :include => :project,
@@ -42,4 +45,10 @@ class News < ActiveRecord::Base
   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
+  
+  private
+  
+  def add_author_as_watcher
+    Watcher.create(:watchable => self, :user => author)
+  end
 end

diff --git a/app/views/mailer/news_comment_added.text.html.rhtml b/app/views/mailer/news_comment_added.text.html.rhtml
new file mode 100644 (file)
index 0000000..ef2be0f
--- /dev/null
+++ b/app/views/mailer/news_comment_added.text.html.rhtml
@@ -0,0 +1,5 @@
+<h1><%= link_to(h(@news.title), @news_url) %></h1>
+
+<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
+
+<%= textilizable @comment, :comments, :only_path => false %>

diff --git a/app/views/mailer/news_comment_added.text.plain.rhtml b/app/views/mailer/news_comment_added.text.plain.rhtml
new file mode 100644 (file)
index 0000000..aadbc37
--- /dev/null
+++ b/app/views/mailer/news_comment_added.text.plain.rhtml
@@ -0,0 +1,6 @@
+<%= @news.title %>
+<%= @news_url %>
+
+<%= l(:text_user_wrote, :value => @comment.author) %>
+
+<%= @comment.comments %>

diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 0dc3fe3588e45534f79bbf269c1ae17f59d04a77..28db44e96460edac9c8228d3b9166b2c4ef5db2c 100644 (file)
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -1,4 +1,5 @@
 <div class="contextual">
+<%= watcher_tag(@news, User.current) %>
 <%= link_to(l(:button_edit), 
       edit_news_path(@news),
       :class => 'icon icon-edit',

diff --git a/config/environment.rb b/config/environment.rb
index 91dfaa42c29917dd92dfee111f6cd4e73a927491..00e8151763d549aa5ac423ac6dfe0c923adebbd4 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -36,7 +36,7 @@ Rails::Initializer.run do |config|
   
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
-  config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer
+  config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
 
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fb51c23bd6ce82c39936d04288437d26ee387bfd..c4126061ccedc0e62fb0a37de766d1a6cff5ac89 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -537,6 +537,7 @@ en:
   label_news_latest: Latest news
   label_news_view_all: View all news
   label_news_added: News added
+  label_news_comment_added: Comment added to a news
   label_settings: Settings
   label_overview: Overview
   label_version: Version

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 91a517d9d769e2fa8f1c77bd241291e1bc474f3e..86c04af382e22655a176136d16c82531574b7353 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -540,6 +540,7 @@ fr:
   label_news_latest: Dernières annonces
   label_news_view_all: Voir toutes les annonces
   label_news_added: Annonce ajoutée
+  label_news_comment_added: Commentaire ajouté à une annonce
   label_settings: Configuration
   label_overview: Aperçu
   label_version: Version

diff --git a/lib/redmine/notifiable.rb b/lib/redmine/notifiable.rb
index 71d1ba5017dee638522500f5138fdf3cee015136..37d4a4072529e973262669e9160f08d5dfb364ad 100644 (file)
--- a/lib/redmine/notifiable.rb
+++ b/lib/redmine/notifiable.rb
@@ -14,6 +14,7 @@ module Redmine
       notifications << Notifiable.new('issue_status_updated', 'issue_updated')
       notifications << Notifiable.new('issue_priority_updated', 'issue_updated')
       notifications << Notifiable.new('news_added')
+      notifications << Notifiable.new('news_comment_added')
       notifications << Notifiable.new('document_added')
       notifications << Notifiable.new('file_added')
       notifications << Notifiable.new('message_posted')

diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 43265c4740e9ba98a15bfd417146cd7241ef5ceb..02be8fc5c14783937e2cb432709f2a3c24287959 100644 (file)
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  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
@@ -31,6 +31,15 @@ class CommentTest < ActiveSupport::TestCase
     @news.reload
     assert_equal 2, @news.comments_count
   end
+  
+  def test_create_should_send_notification
+    Setting.notified_events << 'news_comment_added'
+    Watcher.create!(:watchable => @news, :user => @jsmith)
+    
+    assert_difference 'ActionMailer::Base.deliveries.size' do
+      Comment.create!(:commented => @news, :author => @jsmith, :comments => "my comment")
+    end
+  end
 
   def test_validate
     comment = Comment.new(:commented => @news)

diff --git a/test/unit/lib/redmine/notifiable_test.rb b/test/unit/lib/redmine/notifiable_test.rb
index fe02fbfcd35eda1e5f9322ddcd69c0df38a01622..7ca4492090e7b04c4d5237edf80d62691c44e002 100644 (file)
--- a/test/unit/lib/redmine/notifiable_test.rb
+++ b/test/unit/lib/redmine/notifiable_test.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2008  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  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
@@ -22,9 +22,9 @@ class Redmine::NotifiableTest < ActiveSupport::TestCase
   end
 
   def test_all
-    assert_equal 11, Redmine::Notifiable.all.length
+    assert_equal 12, Redmine::Notifiable.all.length
 
-    %w(issue_added issue_updated issue_note_added issue_status_updated issue_priority_updated news_added document_added file_added message_posted wiki_content_added wiki_content_updated).each do |notifiable|
+    %w(issue_added issue_updated issue_note_added issue_status_updated issue_priority_updated news_added news_comment_added document_added file_added message_posted wiki_content_added wiki_content_updated).each do |notifiable|
       assert Redmine::Notifiable.all.collect(&:name).include?(notifiable), "missing #{notifiable}"
     end
   end

diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index ae7c06d3e1f99449688764311f922fb0da15df9e..36ed4fe94198950b4754c98870445ec64bf42bd3 100644 (file)
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  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
@@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__)
 class MailerTest < ActiveSupport::TestCase
   include Redmine::I18n
   include ActionController::Assertions::SelectorAssertions
-  fixtures :projects, :enabled_modules, :issues, :users, :members, :member_roles, :roles, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories
+  fixtures :all
   
   def setup
     ActionMailer::Base.deliveries.clear
@@ -295,6 +295,14 @@ class MailerTest < ActiveSupport::TestCase
     end
   end
   
+  def test_news_comment_added
+    comment = Comment.find(2)
+    valid_languages.each do |lang|
+      Setting.default_language = lang.to_s
+      assert Mailer.deliver_news_comment_added(comment)
+    end
+  end
+  
   def test_message_posted
     message = Message.find(:first)
     recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}