Enable the watching of news (#2549).

git-svn-id: http://svn.redmine.org/redmine/trunk@12866 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/watchers_controller.rb

@@ -90,7 +90,13 @@ def find_watchables
     klass = Object.const_get(params[:object_type].camelcase) rescue nil
     if klass && klass.respond_to?('watched_by')
       @watchables = klass.where(:id => Array.wrap(params[:object_id])).all
-      raise Unauthorized if @watchables.any? {|w| w.respond_to?(:visible?) && !w.visible?}
+      raise Unauthorized if @watchables.any? {|w|
+        if w.respond_to?(:visible?)
+          !w.visible?
+        elsif w.respond_to?(:project) && w.project
+          !w.project.visible?
+        end
+      }
     end
     render_404 unless @watchables.present?
   end

app/models/enabled_module.rb

@@ -17,6 +17,7 @@
 
 class EnabledModule < ActiveRecord::Base
   belongs_to :project
+  acts_as_watchable
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => :project_id

app/models/mailer.rb

@@ -158,6 +158,7 @@ def news_added(news)
     @news = news
     @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
     mail :to => news.recipients,
+      :cc => news.cc_for_added_news,
       :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
   end
 

app/models/news.rb

@@ -54,6 +54,18 @@ def recipients
     project.users.select {|user| user.notify_about?(self)}.map(&:mail)
   end
 
+  # Returns the email addresses that should be cc'd when a new news is added
+  def cc_for_added_news
+    cc = []
+    if m = project.enabled_module('news')
+      cc = m.notified_watchers
+      unless project.is_public?
+        cc = cc.select {|user| project.users.include?(user)}
+      end
+    end
+    cc.map(&:mail)
+  end
+
   # returns latest news for projects visible by user
   def self.latest(user = User.current, count = 5)
     visible(user).includes([:author, :project]).order("#{News.table_name}.created_on DESC").limit(count).all

app/models/project.rb

@@ -622,9 +622,16 @@ def allows_to?(action)
     end
   end
 
-  def module_enabled?(module_name)
-    module_name = module_name.to_s
-    enabled_modules.detect {|m| m.name == module_name}
+	# Return the enabled module with the given name
+	# or nil if the module is not enabled for the project
+  def enabled_module(name)
+    name = name.to_s
+    enabled_modules.detect {|m| m.name == name}
+  end
+
+	# Return true if the module with the given name is enabled
+  def module_enabled?(name)
+    enabled_module(name).present?
   end
 
   def enabled_module_names=(module_names)

app/views/news/index.html.erb

@@ -3,6 +3,7 @@
             new_project_news_path(@project),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+<%= watcher_link(@project.enabled_module('news'), User.current) %>
 </div>
 
 <div id="add-news" style="display:none;">

test/functional/watchers_controller_test.rb

@@ -56,6 +56,27 @@ def test_watch_a_collection_with_multiple_objects
     assert Issue.find(3).watched_by?(User.find(3))
   end
 
+  def test_watch_a_news_module_should_add_watcher
+    @request.session[:user_id] = 7
+    assert_not_nil m = Project.find(1).enabled_module('news')
+
+    assert_difference 'Watcher.count' do
+      xhr :post, :watch, :object_type => 'enabled_module', :object_id => m.id.to_s
+      assert_response :success
+    end
+    assert m.reload.watched_by?(User.find(7))
+  end
+
+  def test_watch_a_private_news_module_without_permission_should_fail
+    @request.session[:user_id] = 7
+    assert_not_nil m = Project.find(2).enabled_module('news')
+
+    assert_no_difference 'Watcher.count' do
+      xhr :post, :watch, :object_type => 'enabled_module', :object_id => m.id.to_s
+      assert_response 403
+    end
+  end
+
   def test_watch_should_be_denied_without_permission
     Role.find(2).remove_permission! :view_issues
     @request.session[:user_id] = 3

test/unit/mailer_test.rb

@@ -467,6 +467,17 @@ def test_news_added
     end
   end
 
+  def test_news_added_should_notify_project_news_watchers
+    user1 = User.generate!
+    user2 = User.generate!
+    news = News.first
+    news.project.enabled_module('news').add_watcher(user1)
+
+    Mailer.news_added(news).deliver
+    assert_include user1.mail, last_email.bcc
+    assert_not_include user2.mail, last_email.bcc
+  end
+
   def test_news_comment_added
     comment = Comment.find(2)
     valid_languages.each do |lang|