Small Cleanups + Merchandise Search

[cs356-p2-videostore.git] / app / controllers / video_controller.rb

diff --git a/app/controllers/video_controller.rb b/app/controllers/video_controller.rb
index 529e695..0e3d99b 100644 (file)
--- a/app/controllers/video_controller.rb
+++ b/app/controllers/video_controller.rb
@@ -1,7 +1,11 @@
 class VideoController < ApplicationController
+  layout "admin"
+
+  # Make sure that a user logs in before doing any action here
+  before_filter :authorize, :except => :login
+
   def index
-    list
-    render :action => 'list'
+    render :action => 'index'
   end
 
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
@@ -21,11 +25,7 @@ class VideoController < ApplicationController
   end
 
   def create
-    @rentable = Rentable.new
-    @rentable.save!
-    puts "created new rentable with ID: #{@rentable.id}"
     @video = Video.new(params[:video])
-    @video.rentable_id = @rentable.id
     if @video.save
       flash[:notice] = 'Video was successfully created.'
       redirect_to :action => 'list'
@@ -52,4 +52,14 @@ class VideoController < ApplicationController
     Video.find(params[:id]).destroy
     redirect_to :action => 'list'
   end
+
+  def search
+    if request.post?
+      @query = params[:q]
+      @videos = Video.find(:all, :conditions => ["title like ?", "%#{@query[0]}%"])
+      render :action => 'searchresults'
+    else
+      render :action => 'search'
+    end
+  end
 end