projects
/
cs356-p2-videostore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Reciept to the Purchase System
[cs356-p2-videostore.git]
/
app
/
controllers
/
video_controller.rb
diff --git
a/app/controllers/video_controller.rb
b/app/controllers/video_controller.rb
index
4221c3c
..
2451704
100644
(file)
--- a/
app/controllers/video_controller.rb
+++ b/
app/controllers/video_controller.rb
@@
-1,7
+1,11
@@
class VideoController < ApplicationController
class VideoController < ApplicationController
+ layout "admin"
+
+ # Make sure that a user logs in before doing any action here
+ before_filter :authorize, :except => :login
+
def index
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)
@@
-21,13
+25,7
@@
class VideoController < ApplicationController
end
def create
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.rtype = 'video'
- @rentable.save!
@video = Video.new(params[:video])
@video = Video.new(params[:video])
- @video.rentable_id = @rentable.id
if @video.save
flash[:notice] = 'Video was successfully created.'
redirect_to :action => 'list'
if @video.save
flash[:notice] = 'Video was successfully created.'
redirect_to :action => 'list'
@@
-54,4
+52,14
@@
class VideoController < ApplicationController
Video.find(params[:id]).destroy
redirect_to :action => 'list'
end
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
end