X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=app%2Fcontrollers%2Fmerchandise_controller.rb;h=f819b30500fcd5f55e5ed579ee39f9e4a026803e;hb=HEAD;hp=fb7beff95fb441f2f2d656140aa771351eaa6be2;hpb=233a6b122bc4aed44a0babee0797d2dba6da5b06;p=cs356-p2-videostore.git

diff --git a/app/controllers/merchandise_controller.rb b/app/controllers/merchandise_controller.rb
index fb7beff..f819b30 100644
--- a/app/controllers/merchandise_controller.rb
+++ b/app/controllers/merchandise_controller.rb
@@ -1,11 +1,11 @@
 class MerchandiseController < ApplicationController
+  layout "admin"
 
   # Make sure that a user logs in before doing any action here
   before_filter :authorize
 
   def index
-    list
-    render :action => 'list'
+    render :action => 'index'
   end
 
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
@@ -52,4 +52,14 @@ class MerchandiseController < ApplicationController
     Merchandise.find(params[:id]).destroy
     redirect_to :action => 'list'
   end
+
+  def search
+    if request.post?
+      @query = params[:q]
+      @merchandises = Merchandise.find(:all, :conditions => ["title like ?", "%#{@query[0]}%"])
+      render :action => 'searchresults'
+    else
+      render :action => 'search'
+    end
+  end
 end