jro_apps/redmine Commit - r11113:deffd81ada71

Use POST/DELETE to watch/unwatch an item....

Jean-Philippe Lang -

r11113:deffd81ada71

parent child

Context file:

r11113:deffd81ada71

app/helpers/watchers_helper.rb +4 -5

                 watched = objects.any? {|object| object.watched_by?(user)}
                 css = [watcher_css(objects), watched ? 'icon icon-fav' : 'icon icon-fav-off'].join(' ')
                 text = watched ? l(:button_unwatch) : l(:button_watch)
-                url = {
+                url = watch_path(
-                  :controller => 'watchers',
-                  :action => (watched ? 'unwatch' : 'watch'),
                   :object_type => objects.first.class.to_s.underscore,
                   :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)
+                )
+                method = watched ? 'delete' : 'post'
-                link_to text, url, :remote => true, :method => 'post', :class => css
+                link_to text, url, :remote => true, :method => method, :class => css
               end
               # Returns the css class used to identify watch links for a given +object+

config/routes.rb +2 -2

               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
+              post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
+              delete 'watchers/watch', :to => 'watchers#unwatch'
               get 'watchers/new', :to => 'watchers#new'
               post 'watchers', :to => 'watchers#create'
               post 'watchers/append', :to => 'watchers#append'
               post 'watchers/destroy', :to => 'watchers#destroy'
-              post 'watchers/watch', :to => 'watchers#watch'
-              post 'watchers/unwatch', :to => 'watchers#unwatch'
               get 'watchers/autocomplete_for_user', :to => 'watchers#autocomplete_for_user'
               # Specific routes for issue watchers API
               post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'

test/functional/watchers_controller_test.rb +2 -2

               def test_unwatch
                 @request.session[:user_id] = 3
                 assert_difference('Watcher.count', -1) do
-                  xhr :post, :unwatch, :object_type => 'issue', :object_id => '2'
+                  xhr :delete, :unwatch, :object_type => 'issue', :object_id => '2'
                   assert_response :success
                   assert_include '$(".issue-2-watcher")', response.body
                 end
                 Watcher.create!(:user_id => 3, :watchable => Issue.find(3))
                 assert_difference('Watcher.count', -2) do
-                  xhr :post, :unwatch, :object_type => 'issue', :object_id => ['1', '3']
+                  xhr :delete, :unwatch, :object_type => 'issue', :object_id => ['1', '3']
                   assert_response :success
                   assert_include '$(".issue-bulk-watcher")', response.body
                 end

test/integration/routing/watchers_test.rb +1 -1

                     { :controller => 'watchers', :action => 'watch' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/watchers/unwatch" },
+                    { :method => 'delete', :path => "/watchers/watch" },
                     { :controller => 'watchers', :action => 'unwatch' }
                   )
                 assert_routing(

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