moved movie migration to seeds, updated movie controller, movie index…

… view
sunserg · Sep 27, 2012 · d064cbd · d064cbd
1 parent 58d77e2
commit d064cbd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 33 deletions.
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
@@ -16,13 +16,12 @@ def index
     end
     @all_ratings = Movie.all_ratings
     @selected_ratings = params[:ratings] || session[:ratings] || {}
-
-    if params[:sort] != session[:sort]
-      session[:sort] = sort
-      redirect_to :sort => sort, :ratings => @selected_ratings and return
+
+    if @selected_ratings == {}
+      @selected_ratings = Hash[@all_ratings.map {|rating| [rating, rating]}]
     end
-
-    if params[:ratings] != session[:ratings] and @selected_ratings != {}
+    
+    if params[:sort] != session[:sort] or params[:ratings] != session[:ratings]
       session[:sort] = sort
       session[:ratings] = @selected_ratings
       redirect_to :sort => sort, :ratings => @selected_ratings and return

diff --git a/app/views/movies/index.html.haml b/app/views/movies/index.html.haml
@@ -7,7 +7,7 @@
   Include: 
   - @all_ratings.each do |rating|
     = rating
-    = check_box_tag "ratings[#{rating}]", 1, @selected_ratings.include?(rating)
+    = check_box_tag "ratings[#{rating}]", 1, @selected_ratings.include?(rating), :id => "ratings_#{rating}"
   = submit_tag 'Refresh', :id => 'ratings_submit'
 
 %table#movies
@@ -17,7 +17,7 @@
       %th Rating
       %th{:class => @date_header}= link_to 'Release Date', movies_path(:sort => 'release_date', :ratings => @selected_ratings), :id => 'release_date_header'
       %th More Info
-  %tbody#movielist
+  %tbody
     - @movies.each do |movie|
       %tr
         %td= movie.title 

diff --git a/db/migrate/20120130161449_add_more_movies.rb b/db/migrate/20120130161449_add_more_movies.rb
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -5,3 +5,19 @@
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
+
+movies = [{:title => 'Aladdin', :rating => 'G', :release_date => '25-Nov-1992'},
+    	  {:title => 'The Terminator', :rating => 'R', :release_date => '26-Oct-1984'},
+    	  {:title => 'When Harry Met Sally', :rating => 'R', :release_date => '21-Jul-1989'},
+      	  {:title => 'The Help', :rating => 'PG-13', :release_date => '10-Aug-2011'},
+      	  {:title => 'Chocolat', :rating => 'PG-13', :release_date => '5-Jan-2001'},
+      	  {:title => 'Amelie', :rating => 'R', :release_date => '25-Apr-2001'},
+      	  {:title => '2001: A Space Odyssey', :rating => 'G', :release_date => '6-Apr-1968'},
+      	  {:title => 'The Incredibles', :rating => 'PG', :release_date => '5-Nov-2004'},
+      	  {:title => 'Raiders of the Lost Ark', :rating => 'PG', :release_date => '12-Jun-1981'},
+      	  {:title => 'Chicken Run', :rating => 'G', :release_date => '21-Jun-2000'},
+  	 ]
+
+movies.each do |movie|
+  Movie.create!(movie)
+end