From 74f8fe46c63f41df3ac552de78cc20d40d1237cd Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Tue, 4 Feb 2014 14:14:02 +1100 Subject: [PATCH] Switching description to notes on shopping page --- app/views/shop/_products.html.haml | 2 +- app/views/shop/products.rabl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml index 52eabec9e7..1471fc26fb 100644 --- a/app/views/shop/_products.html.haml +++ b/app/views/shop/_products.html.haml @@ -19,7 +19,7 @@ %h5 {{ product.name }} {{ product.supplier.name }} - %td.notes {{ product.description | truncate:80 }} + %td.notes {{ product.notes | truncate:80 }} %td {{ product.master.options_text }} diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl index 265c02a08b..4a868e01eb 100644 --- a/app/views/shop/products.rabl +++ b/app/views/shop/products.rabl @@ -1,7 +1,8 @@ collection @products attributes :id, :name, :price, :permalink, :count_on_hand, :on_demand, :group_buy node do |product| - {description: strip_tags(product.description)} + {notes: strip_tags(product.notes), + description: strip_tags(product.description)} end child :supplier => :supplier do