jro_apps/redmine Commit - r2863:97b4e754787d

Add a permission to remove issue watchers (#2450)....

Jean-Philippe Lang -

r2863:97b4e754787d

parent child

Context file:

r2863:97b4e754787d

app/controllers/watchers_controller.rb +13 -1

             class WatchersController < ApplicationController
               before_filter :find_project
               before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
-              before_filter :authorize, :only => :new
+              before_filter :authorize, :only => [:new, :destroy]
               verify :method => :post,
                      :only => [ :watch, :unwatch ],
                 render :text => 'Watcher added.', :layout => true
               end
+              def destroy
+                @watched.set_watcher(User.find(params[:user_id]), false) if request.post?
+                respond_to do |format|
+                  format.html { redirect_to :back }
+                  format.js do
+                    render :update do |page|
+                      page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
+                    end
+                  end
+                end
+              end
             private
               def find_project
                 klass = Object.const_get(params[:object_type].camelcase)

app/helpers/watchers_helper.rb +16 -1

@@ -36,6 +36,21 module WatchersHelper
36		36
37	# Returns a comma separated list of users watching the given object	37	# Returns a comma separated list of users watching the given object
38	def watchers_list(object)	38	def watchers_list(object)
39	object.watcher_users.collect {\|u\| content_tag('span', link_to_user(u), :class => 'user') }.join(",\n")	39	remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project)
		40	object.watcher_users.collect do \|user\|
		41	s = content_tag('span', link_to_user(user), :class => 'user')
		42	if remove_allowed
		43	url = {:controller => 'watchers',
		44	:action => 'destroy',
		45	:object_type => object.class.to_s.underscore,
		46	:object_id => object.id,
		47	:user_id => user}
		48	s += ' ' + link_to_remote(image_tag('delete.png'),
		49	{:url => url},
		50	:href => url_for(url),
		51	:style => "vertical-align: middle")
		52	end
		53	s
		54	end.join(",\n")
40	end	55	end
41	end	56	end

lib/redmine.rb +1 0

                 # Watchers
                 map.permission :view_issue_watchers, {}
                 map.permission :add_issue_watchers, {:watchers => :new}
+                map.permission :delete_issue_watchers, {:watchers => :destroy}
               end
               map.project_module :time_tracking do |map|

test/fixtures/roles.yml +1 0

                 - :delete_issues
                 - :view_issue_watchers
                 - :add_issue_watchers
+                - :delete_issue_watchers
                 - :manage_public_queries
                 - :save_queries
                 - :view_gantt

test/functional/watchers_controller_test.rb +10 0

@@ -67,4 +67,14 class WatchersControllerTest < ActionController::TestCase
67	end	67	end
68	assert Issue.find(2).watched_by?(User.find(4))	68	assert Issue.find(2).watched_by?(User.find(4))
69	end	69	end
		70
		71	def test_remove_watcher
		72	@request.session[:user_id] = 2
		73	assert_difference('Watcher.count', -1) do
		74	xhr :post, :destroy, :object_type => 'issue', :object_id => '2', :user_id => '3'
		75	assert_response :success
		76	assert_select_rjs :replace_html, 'watchers'
		77	end
		78	assert !Issue.find(2).watched_by?(User.find(3))
		79	end
70	end	80	end

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