[PATCH conductor 1/2] BZ805909: fix filter view detection and prevent breadcrumb management on json requests

ifarkas at redhat.com ifarkas at redhat.com
Wed Mar 28 09:24:10 UTC 2012


From: Imre Farkas <ifarkas at redhat.com>

https://bugzilla.redhat.com/show_bug.cgi?id=805909
---
 src/app/controllers/application_controller.rb |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index 0fc0094..db471ba 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -126,10 +126,12 @@ class ApplicationController < ActionController::Base
 
   # let's suppose that 'pretty' view is default
   def filter_view?
-    if @viewstate
-      @viewstate.state['view'] == 'filter'
-    else
+    if params[:view].present?
       params[:view] == 'filter'
+    elsif params[:details_tab].present?
+      true
+    elsif @viewstate
+      @viewstate.state['view'] == 'filter'
     end
   end
 
@@ -228,11 +230,14 @@ class ApplicationController < ActionController::Base
   end
 
   def clear_breadcrumbs
+    return if request.format == :json
+
     session[:breadcrumbs] = []
-    session[:viewstates] = {}
   end
 
   def save_breadcrumb(path, name = controller_name)
+    return if request.format == :json
+
     session[:breadcrumbs] ||= []
     breadcrumbs = session[:breadcrumbs]
     viewstate = @viewstate ? @viewstate.id : nil
-- 
1.7.6.5




More information about the aeolus-devel mailing list