In BPE, rename producer and category JSON attrs to producer_id and category_id

Conflicts:

	spec/features/admin/bulk_product_update_spec.rb
This commit is contained in:
Rohan Mitchell
2014-09-03 13:22:50 +10:00
parent 021cca4fca
commit 29e49b67cc
7 changed files with 33 additions and 33 deletions

View File

@@ -184,7 +184,7 @@ describe "filtering products for submission to database", ->
created_at: null
updated_at: null
count_on_hand: 0
producer: 5
producer_id: 5
group_buy: null
group_buy_unit_size: null
@@ -1051,7 +1051,7 @@ describe "AdminProductEditCtrl", ->
product:
id: 17
name: "new_product"
producer: 6
producer_id: 6
variants: [
id: 3
@@ -1061,7 +1061,7 @@ describe "AdminProductEditCtrl", ->
$httpBackend.expectGET("/api/products/17?template=bulk_show").respond 200,
id: 17
name: "new_product"
producer: 6
producer_id: 6
variants: [
id: 3
@@ -1074,7 +1074,7 @@ describe "AdminProductEditCtrl", ->
id: 17
name: "new_product"
variant_unit_with_scale: null
producer: 6
producer_id: 6
variants: [
id: 3
@@ -1091,7 +1091,7 @@ describe "AdminProductEditCtrl", ->
id: 17
name: "new_product"
variant_unit_with_scale: null
producer: 6
producer_id: 6
variants: [
id: 3