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

                def set_watcher(user, watching)
                  @watched.set_watcher(user, watching)
+                 if params[:replace].present?
+                   if params[:replace].is_a? Array
+                     replace_ids = params[:replace]
+                   else
+                     replace_ids = [params[:replace]]
+                   end
+                 else
+                   replace_ids = 'watcher'
+                 end
                  respond_to do |format|
                    format.html { redirect_to :back }
-                   format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
+                   format.js do
+                     render(:update) do |page|
+                       replace_ids.each do |replace_id|
+                         page.replace_html replace_id, watcher_link(@watched, user, :replace => replace_ids)
+                       end
+                     end
+                   end
                  end
                rescue ::ActionController::RedirectBackError
                  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">
-             <%= 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>
+             <%= render :partial => 'action_menu' %>
              <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

                  end
                  assert Issue.find(1).watched_by?(User.find(3))
                end
+               def test_watch_with_multiple_replacements
+                 @request.session[:user_id] = 3
+                 assert_difference('Watcher.count') do
+                   xhr :post, :watch, :object_type => 'issue', :object_id => '1', :replace => ['watch_item_1','watch_item_2']
+                   assert_response :success
+                   assert_select_rjs :replace_html, 'watch_item_1'
+                   assert_select_rjs :replace_html, 'watch_item_2'
+                 end
+               end
                def test_unwatch
                  @request.session[:user_id] = 3
                  end
                  assert !Issue.find(1).watched_by?(User.find(3))
                end
+               def test_unwatch_with_multiple_replacements
+                 @request.session[:user_id] = 3
+                 assert_difference('Watcher.count', -1) do
+                   xhr :post, :unwatch, :object_type => 'issue', :object_id => '2', :replace => ['watch_item_1', 'watch_item_2']
+                   assert_response :success
+                   assert_select_rjs :replace_html, 'watch_item_1'
+                   assert_select_rjs :replace_html, 'watch_item_2'
+                 end
+                 assert !Issue.find(1).watched_by?(User.find(3))
+               end
                def test_new_watcher
                  @request.session[:user_id] = 2
                  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