From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 24 Feb 2011 17:52:38 +0000 (+0000)
Subject: Do not responde with javascript on regular requests.
X-Git-Tag: 1.2.0~877
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=af8689db988ddac993e0f2c475e63ff431f0d6d7;p=redmine.git

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
---

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