prevent infinite redirects when sorting without filters

daben · Feb 9, 2012 · 4051607 · 4051607
1 parent 52f9f0e
commit 4051607
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
@@ -17,7 +17,12 @@ def index
     @all_ratings = Movie.all_ratings
     @selected_ratings = params[:ratings] || session[:ratings] || {}
 
-    if params[:sort] != session[:sort] or params[:ratings] != session[:ratings]
+    if params[:sort] != session[:sort]
+      session[:sort] = sort
+      redirect_to :sort => sort, :ratings => @selected_ratings and return
+    end
+
+    if params[:ratings] != session[:ratings] and @selected_ratings != {}
       session[:sort] = sort
       session[:ratings] = @selected_ratings
       redirect_to :sort => sort, :ratings => @selected_ratings and return