jro_apps/redmine Commit - r12591:1ad33134d300

Enable the watching of news (#2549)....

Jean-Philippe Lang -

r12591:1ad33134d300

parent child

Context file:

r12591:1ad33134d300

app/controllers/watchers_controller.rb +7 -1

                 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 +1 0

             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 +1 0

                 @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 +12 0

@@ -54,6 +54,18 class News < ActiveRecord::Base
54	project.users.select {\|user\| user.notify_about?(self)}.map(&:mail)	54	project.users.select {\|user\| user.notify_about?(self)}.map(&:mail)
55	end	55	end
56		56
		57	# Returns the email addresses that should be cc'd when a new news is added
		58	def cc_for_added_news
		59	cc = []
		60	if m = project.enabled_module('news')
		61	cc = m.notified_watchers
		62	unless project.is_public?
		63	cc = cc.select {\|user\| project.users.include?(user)}
		64	end
		65	end
		66	cc.map(&:mail)
		67	end
		68
57	# returns latest news for projects visible by user	69	# returns latest news for projects visible by user
58	def self.latest(user = User.current, count = 5)	70	def self.latest(user = User.current, count = 5)
59	visible(user).includes([:author, :project]).order("#{News.table_name}.created_on DESC").limit(count).all	71	visible(user).includes([:author, :project]).order("#{News.table_name}.created_on DESC").limit(count).all

app/models/project.rb +10 -3

@@ -622,9 +622,16 class Project < ActiveRecord::Base
622	end	622	end
623	end	623	end
624		624
625	def module_enabled?(module_name)	625	# Return the enabled module with the given name
626	module_name = module_name.to_s	626	# or nil if the module is not enabled for the project
627	enabled_modules.detect {\|m\| m.name == module_name}	627	def enabled_module(name)
		628	name = name.to_s
		629	enabled_modules.detect {\|m\| m.name == name}
		630	end
		631
		632	# Return true if the module with the given name is enabled
		633	def module_enabled?(name)
		634	enabled_module(name).present?
628	end	635	end
629		636
630	def enabled_module_names=(module_names)	637	def enabled_module_names=(module_names)

app/views/news/index.html.erb +1 0

                         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 +21 0

@@ -56,6 +56,27 class WatchersControllerTest < ActionController::TestCase
56	assert Issue.find(3).watched_by?(User.find(3))	56	assert Issue.find(3).watched_by?(User.find(3))
57	end	57	end
58		58
		59	def test_watch_a_news_module_should_add_watcher
		60	@request.session[:user_id] = 7
		61	assert_not_nil m = Project.find(1).enabled_module('news')
		62
		63	assert_difference 'Watcher.count' do
		64	xhr :post, :watch, :object_type => 'enabled_module', :object_id => m.id.to_s
		65	assert_response :success
		66	end
		67	assert m.reload.watched_by?(User.find(7))
		68	end
		69
		70	def test_watch_a_private_news_module_without_permission_should_fail
		71	@request.session[:user_id] = 7
		72	assert_not_nil m = Project.find(2).enabled_module('news')
		73
		74	assert_no_difference 'Watcher.count' do
		75	xhr :post, :watch, :object_type => 'enabled_module', :object_id => m.id.to_s
		76	assert_response 403
		77	end
		78	end
		79
59	def test_watch_should_be_denied_without_permission	80	def test_watch_should_be_denied_without_permission
60	Role.find(2).remove_permission! :view_issues	81	Role.find(2).remove_permission! :view_issues
61	@request.session[:user_id] = 3	82	@request.session[:user_id] = 3

test/unit/mailer_test.rb +11 0

@@ -467,6 +467,17 class MailerTest < ActiveSupport::TestCase
467	end	467	end
468	end	468	end
469		469
		470	def test_news_added_should_notify_project_news_watchers
		471	user1 = User.generate!
		472	user2 = User.generate!
		473	news = News.first
		474	news.project.enabled_module('news').add_watcher(user1)
		475
		476	Mailer.news_added(news).deliver
		477	assert_include user1.mail, last_email.bcc
		478	assert_not_include user2.mail, last_email.bcc
		479	end
		480
470	def test_news_comment_added	481	def test_news_comment_added
471	comment = Comment.find(2)	482	comment = Comment.find(2)
472	valid_languages.each do \|lang\|	483	valid_languages.each do \|lang\|

General Comments 0

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

No TODOs yet

	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