X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=app%2Fcontrollers%2Fmerchandise_controller.rb;h=79a85dd99e17676dadec3204c404596f05a842cf;hb=31c3621ad8a43715ecc02655d58b20099308fe50;hp=fb7beff95fb441f2f2d656140aa771351eaa6be2;hpb=233a6b122bc4aed44a0babee0797d2dba6da5b06;p=cs356-p2-videostore.git

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