X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=app%2Fcontrollers%2Fvideo_controller.rb;h=24517042a3eb84f289087f7f6e0c434b40a4cc09;hb=3675868d3ed4abc289309694772c385d529e35fa;hp=ad3aaee348a757003ed76d781ea0c87d56e9ca2b;hpb=2f9cf2b379b797bca623f032f7234f09e3b3c3af;p=cs356-p2-videostore.git

diff --git a/app/controllers/video_controller.rb b/app/controllers/video_controller.rb
index ad3aaee..2451704 100644
--- 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,12 +25,7 @@ class VideoController < ApplicationController
   end
 
   def create
-    # A new rentable must be created and saved whenever we create a new
-    # video. This is so we have a rentable_id to add to the video.
-    @rentable = Rentable.new
-    @rentable.save!
     @video = Video.new(params[:video])
-    @video.rentable_id = @rentable.id
     if @video.save
       flash[:notice] = 'Video was successfully created.'
       redirect_to :action => 'list'
@@ -53,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