X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=app%2Fcontrollers%2Fcustomer_controller.rb;h=296f64f7f410ee240a11b5a5605c782f09074d12;hb=b12881a928516bca02b2bd8ce1bbe9288840c76f;hp=1e560c0e67236fa049fe2ea3c328a0631f8096a7;hpb=233a6b122bc4aed44a0babee0797d2dba6da5b06;p=cs356-p2-videostore.git

diff --git a/app/controllers/customer_controller.rb b/app/controllers/customer_controller.rb
index 1e560c0..296f64f 100644
--- 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