From b29b39290a35059af29d3c747deafe25d222be7f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 29 Jun 2008 19:56:20 +0000 Subject: [PATCH] Redirects back after clicking watch/unwatch links without javascript (#1337). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1607 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/watchers_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 206dc0843..014779b7f 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -23,18 +23,22 @@ class WatchersController < ApplicationController user = User.current @watched.add_watcher(user) respond_to do |format| - format.html { render :text => 'Watcher added.', :layout => true } + format.html { redirect_to :back } format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} } end + rescue RedirectBackError + render :text => 'Watcher added.', :layout => true end def remove user = User.current @watched.remove_watcher(user) respond_to do |format| - format.html { render :text => 'Watcher removed.', :layout => true } + format.html { redirect_to :back } format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} } end + rescue RedirectBackError + render :text => 'Watcher removed.', :layout => true end private -- 2.39.5