resolved problem with restful

jaesgar · Mar 10, 2012 · a31d1e9 · a31d1e9
1 parent dce86ac
commit a31d1e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
@@ -13,19 +13,18 @@ def index
     end
     @ratings = params[:ratings]
     if @ratings.nil? && params[:commit].nil? then 
-      @ratings = (session[:ratings].nil?)? Hash.new : session[:ratings] 
-    elsif @ratings.nil? && !params[:commit].nil? then
-      @ratings = Hash.new
+      @ratings = (session[:ratings].nil?)? nil : session[:ratings]
     end
-#    if @sort_by != params[:sort_by] || @ratings != params[:ratings]
-#      redirect_to movies_path(params.merge(:sort_by => @sort_by, :ratings => @ratings))
-#    else 
+    logger.info(params[:ratings])
+    if @sort_by != params[:sort_by] || @ratings != params[:ratings] 
+      redirect_to movies_path(params.merge(:sort_by => @sort_by, :ratings => @ratings))
+    else 
       session[:sort_by] = @sort_by
       session[:ratings] = @ratings
-      condition = (@ratings.keys.empty? == false)?["rating IN (?)", @ratings.keys] : nil;
+      condition = (!@ratings.nil? && @ratings.keys.empty? == false)?["rating IN (?)", @ratings.keys] : nil;
       @movies = Movie.find(:all, :conditions => condition, :order => @sort_by)
       @all_ratings = Movie.all_ratings
-#    end
+    end
    #  @all_ratings.each{|rating| logger.info(rating.rating)}
    # logger.info(@all_ratings)
   end

diff --git a/app/views/movies/index.html.haml b/app/views/movies/index.html.haml
@@ -5,7 +5,7 @@
   Include: 
   - @all_ratings.each do |rating|
     = rating
-    = check_box_tag "ratings[#{rating}]", 1 ,(@ratings.key?(rating) && @ratings[rating])
+    = check_box_tag "ratings[#{rating}]", 1 ,(!@ratings.nil? && @ratings.key?(rating) && @ratings[rating])
   = submit_tag 'Refresh', :id=>"ratings_submit"
 
 %table#movies