summaryrefslogtreecommitdiffstats
path: root/app/controllers/journals_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-02-24 17:52:38 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-02-24 17:52:38 +0000
commitaf8689db988ddac993e0f2c475e63ff431f0d6d7 (patch)
tree334ac1b6f66516b8f763de6edbbdce0cad918cc5 /app/controllers/journals_controller.rb
parent9a8c88ec0af06a9ed84ffcbcbaf4ef42a32e9f27 (diff)
downloadredmine-af8689db988ddac993e0f2c475e63ff431f0d6d7.tar.gz
redmine-af8689db988ddac993e0f2c475e63ff431f0d6d7.zip
Do not responde with javascript on regular requests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4946 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/journals_controller.rb')
-rw-r--r--app/controllers/journals_controller.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index d3b56e8cb..189204e26 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -75,6 +75,14 @@ class JournalsController < ApplicationController
format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
format.js { render :action => 'update' }
end
+ else
+ respond_to do |format|
+ format.html {
+ # TODO: implement non-JS journal update
+ render :nothing => true
+ }
+ format.js
+ end
end
end