X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=app%2Fcontrollers%2Fmerchandise_controller.rb;h=79a85dd99e17676dadec3204c404596f05a842cf;hb=d9ccb8cf52aee119343545cb734e185580daf352;hp=062a3ef644b81f891df9cfefe2a9fee99d9a57c4;hpb=f4a463b2d77fccc4919aea19a54736db6e485688;p=cs356-p2-videostore.git

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