projects
/
cs356-p2-videostore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small Cleanups + Merchandise Search
[cs356-p2-videostore.git]
/
app
/
controllers
/
merchandise_controller.rb
diff --git
a/app/controllers/merchandise_controller.rb
b/app/controllers/merchandise_controller.rb
index
fb7beff
..
f819b30
100644
(file)
--- a/
app/controllers/merchandise_controller.rb
+++ b/
app/controllers/merchandise_controller.rb
@@
-1,11
+1,11
@@
class MerchandiseController < ApplicationController
class MerchandiseController < ApplicationController
+ layout "admin"
# Make sure that a user logs in before doing any action here
before_filter :authorize
def index
# 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)
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
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
end