Add VideoMedia to the Video pages

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

diff --git a/app/controllers/merchandise_controller.rb b/app/controllers/merchandise_controller.rb
index 062a3ef..79a85dd 100644 (file)
--- a/app/controllers/merchandise_controller.rb
+++ b/app/controllers/merchandise_controller.rb
@@ -1,7 +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)