X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=app%2Fviews%2Fmerchandise%2Flist.rhtml;h=91e8f5ee7bf56f5c35b7b53d9844524bae73f4cc;hb=refs%2Ftags%2Fturned-in;hp=a328f09f8d2f015f023e70917eb3c3b8fa98280d;hpb=6de5aedfe8ff0bc967b3690ae53d1f4205c10798;p=cs356-p2-videostore.git

diff --git a/app/views/merchandise/list.rhtml b/app/views/merchandise/list.rhtml
index a328f09..91e8f5e 100644
--- a/app/views/merchandise/list.rhtml
+++ b/app/views/merchandise/list.rhtml
@@ -1,22 +1,21 @@
 <h1>Listing merchandises</h1>
 
-<table>
+<table border="1">
   <tr>
-  <th>Merchandise ID</th>
-  <% for column in Merchandise.content_columns %>
-    <th><%= column.human_name %></th>
-  <% end %>
+    <th>Merchandise ID</th>
+    <th>Title</th>
+    <th>Quantity Remaining</th>
+    <th>Price Per Unit</th>
   </tr>
   
 <% for merchandise in @merchandises %>
   <tr>
-  <td><%=h merchandise.id %></td>
-  <% for column in Merchandise.content_columns %>
-    <td><%=h merchandise.send(column.name) %></td>
-  <% end %>
-    <td><%= link_to 'Show', :action => 'show', :id => merchandise %></td>
+    <td><%=h merchandise.id %></td>
+    <td><%=link_to merchandise.title.to_s, :action => 'show', :id => merchandise %></td>
+    <td><%=h merchandise.quantity %></td>
+    <td><%=h number_to_currency(merchandise.price) %></td>
     <td><%= link_to 'Edit', :action => 'edit', :id => merchandise %></td>
-    <td><%= link_to 'Destroy', { :action => 'destroy', :id => merchandise }, :confirm => 'Are you sure?', :method => :post %></td>
+    <td><%= link_to 'Remove', { :action => 'destroy', :id => merchandise }, :confirm => 'Are you sure?', :method => :post %></td>
   </tr>
 <% end %>
 </table>