jro_apps/redmine Commit - r3005:e02da72947d2

Add a second action menu to IssuesController#show. (#4331)...

Eric Davis -

r3005:e02da72947d2

parent child

Context file:

r3005:e02da72947d2

Collapse all files

app/views/issues/_action_menu.rhtml created 644 +9 0

@@ -0,0 +1,9
	1	<div class="contextual">
	2	<%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
	3	<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time-add' %>
	4	<% replace_watcher \|\|= 'watcher' %>
	5	<%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watcher','watcher2']}) %>
	6	<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
	7	<%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :id => @issue }, :class => 'icon icon-move' %>
	8	<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
	9	</div>

app/controllers/watchers_controller.rb +16 -1

@@ -72,9 +72,24 private
72		72
73	def set_watcher(user, watching)	73	def set_watcher(user, watching)
74	@watched.set_watcher(user, watching)	74	@watched.set_watcher(user, watching)
		75	if params[:replace].present?
		76	if params[:replace].is_a? Array
		77	replace_ids = params[:replace]
		78	else
		79	replace_ids = [params[:replace]]
		80	end
		81	else
		82	replace_ids = 'watcher'
		83	end
75	respond_to do \|format\|	84	respond_to do \|format\|
76	format.html { redirect_to :back }	85	format.html { redirect_to :back }
77	format.js { render(:update) {\|page\| page.replace_html 'watcher', watcher_link(@watched, user)} }	86	format.js do
		87	render(:update) do \|page\|
		88	replace_ids.each do \|replace_id\|
		89	page.replace_html replace_id, watcher_link(@watched, user, :replace => replace_ids)
		90	end
		91	end
		92	end
78	end	93	end
79	rescue ::ActionController::RedirectBackError	94	rescue ::ActionController::RedirectBackError
80	render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true	95	render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true

app/helpers/watchers_helper.rb +15 -4

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module WatchersHelper
-              def watcher_tag(object, user)
-                content_tag("span", watcher_link(object, user), :id => 'watcher')
+              # Valid options
+              # * :id - the element id
+              # * :replace - a string or array of element ids that will be
+              #   replaced
+              def watcher_tag(object, user, options={:replace => 'watcher'})
+                id = options[:id]
+                id ||= options[:replace] if options[:replace].is_a? String
+                content_tag("span", watcher_link(object, user, options), :id => id)
               end
-              def watcher_link(object, user)
+              # Valid options
+              # * :replace - a string or array of element ids that will be
+              #   replaced
+              def watcher_link(object, user, options={:replace => 'watcher'})
                 return '' unless user && user.logged? && object.respond_to?('watched_by?')
                 watched = object.watched_by?(user)
                 url = {:controller => 'watchers',
                        :action => (watched ? 'unwatch' : 'watch'),
                        :object_type => object.class.to_s.underscore,
-                       :object_id => object.id}
+                       :object_id => object.id,
+                       :replace => options[:replace]}
                 link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
                                {:url => url},
                                :href => url_for(url),

app/views/issues/show.rhtml +4 -8

-            <div class="contextual">
+            <%= render :partial => 'action_menu' %>
-            <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
-            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time-add' %>
-            <%= watcher_tag(@issue, User.current) %>
-            <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
-            <%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :id => @issue }, :class => 'icon icon-move' %>
-            <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-            </div>
             <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
             <%= render :partial => 'history', :locals => { :journals => @journals } %>
             </div>
             <% end %>
+            <%= render :partial => 'action_menu', :locals => {:replace_watcher => 'watcher2' } %>
             <div style="clear: both;"></div>
             <% if authorize_for('issues', 'edit') %>

test/functional/watchers_controller_test.rb +22 -1

@@ -47,6 +47,16 class WatchersControllerTest < ActionController::TestCase
47	end	47	end
48	assert Issue.find(1).watched_by?(User.find(3))	48	assert Issue.find(1).watched_by?(User.find(3))
49	end	49	end
		50
		51	def test_watch_with_multiple_replacements
		52	@request.session[:user_id] = 3
		53	assert_difference('Watcher.count') do
		54	xhr :post, :watch, :object_type => 'issue', :object_id => '1', :replace => ['watch_item_1','watch_item_2']
		55	assert_response :success
		56	assert_select_rjs :replace_html, 'watch_item_1'
		57	assert_select_rjs :replace_html, 'watch_item_2'
		58	end
		59	end
50		60
51	def test_unwatch	61	def test_unwatch
52	@request.session[:user_id] = 3	62	@request.session[:user_id] = 3
@@ -57,7 +67,18 class WatchersControllerTest < ActionController::TestCase
57	end	67	end
58	assert !Issue.find(1).watched_by?(User.find(3))	68	assert !Issue.find(1).watched_by?(User.find(3))
59	end	69	end
60		70
		71	def test_unwatch_with_multiple_replacements
		72	@request.session[:user_id] = 3
		73	assert_difference('Watcher.count', -1) do
		74	xhr :post, :unwatch, :object_type => 'issue', :object_id => '2', :replace => ['watch_item_1', 'watch_item_2']
		75	assert_response :success
		76	assert_select_rjs :replace_html, 'watch_item_1'
		77	assert_select_rjs :replace_html, 'watch_item_2'
		78	end
		79	assert !Issue.find(1).watched_by?(User.find(3))
		80	end
		81
61	def test_new_watcher	82	def test_new_watcher
62	@request.session[:user_id] = 2	83	@request.session[:user_id] = 2
63	assert_difference('Watcher.count') do	84	assert_difference('Watcher.count') do

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