Small Cleanups + Merchandise Search

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

diff --git a/app/controllers/customer_controller.rb b/app/controllers/customer_controller.rb
index 1e560c0..f6ec048 100644 (file)
--- a/app/controllers/customer_controller.rb
+++ b/app/controllers/customer_controller.rb
@@ -1,11 +1,11 @@
 class CustomerController < ApplicationController
+  layout "admin"
 
   # Make sure that the user has logged in before they can take any action
   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)
@@ -53,12 +53,13 @@ class CustomerController < ApplicationController
     redirect_to :action => 'list'
   end
 
-  def searchbyname
-    render :action => 'searchbyname'
-  end
-
-  def searchresults
-    query = params[:q]
-    @customers = Customer.find(:all, :conditions => ["name like ?", query[0]+"%"] )
+  def search
+    if request.post?
+      @query = params[:q]
+      @customers = Customer.find(:all, :conditions => ["name like ?", "%#{@query[0]}%"])
+      render :action => 'searchresults'
+    else
+      render :action => 'search'
+    end
   end
 end