Merge branch 'master' of github.com:senaduka/ribica

2015-03-29 12:47:08 +02:00
parent 7acf1a8d6c 71fbde93de
commit b3fc46633c
20 changed files with 294 additions and 25 deletions
--- a/front-api/controllers/item.rb
+++ b/front-api/controllers/item.rb
@@ -4,7 +4,8 @@ def prepare_items_for_mass_display(items)
     :include => [      
      :unit ,
      :multi_media_descriptions ,
-      :sub_category
+      :sub_category,
+      :brand
  ])
 end

@@ -94,4 +95,4 @@ get '/item/item_group/:item_group_id/offset/:offset/limit/:limit' do |item_group

  items = ItemGroup.find(item_group_id).all_items(offset, limit)
  prepare_items_for_mass_display(items)
-end
+end