mirror of
https://github.com/redmine/redmine.git
synced 2025-12-16 05:20:28 +01:00
shorten long line of WatchersController
git-svn-id: http://svn.redmine.org/redmine/trunk@20272 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -50,9 +50,13 @@ class WatchersController < ApplicationController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { redirect_to_referer_or {render :html => 'Watcher added.', :status => 200, :layout => true}}
|
format.html do
|
||||||
format.js { @users = users_for_new_watcher }
|
redirect_to_referer_or do
|
||||||
format.api { render_api_ok }
|
render(:html => 'Watcher added.', :status => 200, :layout => true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
format.js {@users = users_for_new_watcher}
|
||||||
|
format.api {render_api_ok}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -72,9 +76,13 @@ class WatchersController < ApplicationController
|
|||||||
watchable.set_watcher(user, false)
|
watchable.set_watcher(user, false)
|
||||||
end
|
end
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { redirect_to_referer_or {render :html => 'Watcher removed.', :status => 200, :layout => true} }
|
format.html do
|
||||||
|
redirect_to_referer_or do
|
||||||
|
render(:html => 'Watcher removed.', :status => 200, :layout => true)
|
||||||
|
end
|
||||||
|
end
|
||||||
format.js
|
format.js
|
||||||
format.api { render_api_ok }
|
format.api {render_api_ok}
|
||||||
end
|
end
|
||||||
rescue ActiveRecord::RecordNotFound
|
rescue ActiveRecord::RecordNotFound
|
||||||
render_404
|
render_404
|
||||||
@@ -113,9 +121,14 @@ class WatchersController < ApplicationController
|
|||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html do
|
format.html do
|
||||||
text = watching ? 'Watcher added.' : 'Watcher removed.'
|
text = watching ? 'Watcher added.' : 'Watcher removed.'
|
||||||
redirect_to_referer_or {render :html => text, :status => 200, :layout => true}
|
redirect_to_referer_or do
|
||||||
|
render(:html => text, :status => 200, :layout => true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
format.js do
|
||||||
|
render(:partial => 'set_watcher',
|
||||||
|
:locals => {:user => user, :watched => watchables})
|
||||||
end
|
end
|
||||||
format.js { render :partial => 'set_watcher', :locals => {:user => user, :watched => watchables} }
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user