raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

BPE uses soft-delete

Browse Source
This commit is contained in:
Rohan Mitchell
2014-04-04 14:12:27 +11:00
parent e6d988ff34
commit d16d970952
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/bulk_product_update.js.coffee
View File

@@ -291,7 +291,7 @@ productEditModule.controller "AdminProductEditCtrl", [
if confirm("Are you sure?")
$http(
method: "DELETE"
url: "/api/products/" + product.id + "/variants/" + variant.id
url: "/api/products/" + product.permalink_live + "/variants/" + variant.id + "/soft_delete"
).success (data) ->
$scope.removeVariant(product, variant)

4
spec/features/admin/bulk_product_update_spec.rb
View File

@@ -609,7 +609,7 @@ feature %q{
visit '/admin/products/bulk_edit'
page.should have_selector "a.view-variants"
all("a.view-variants").each{ |e| e.click }
all("a.view-variants").each { |e| e.click }
page.should have_selector "a.delete-variant", :count => 3
@@ -620,7 +620,7 @@ feature %q{
visit '/admin/products/bulk_edit'
page.should have_selector "a.view-variants"
all("a.view-variants").select{ |e| e.visible? }.each{ |e| e.click }
all("a.view-variants").select { |e| e.visible? }.each { |e| e.click }
page.should have_selector "a.delete-variant", :count => 2
end

6
spec/javascripts/unit/bulk_product_update_spec.js.coffee
View File

@@ -1100,7 +1100,7 @@ describe "AdminProductEditCtrl", ->
describe "when the variant has been saved", ->
it "deletes variants with a http delete request to /api/products/product_id/variants/(variant_id)", ->
it "deletes variants with a http delete request to /api/products/product_permalink/variants/(variant_id)", ->
spyOn(window, "confirm").andReturn true
scope.products = [
{
@@ -1117,7 +1117,7 @@ describe "AdminProductEditCtrl", ->
}
]
scope.dirtyProducts = {}
httpBackend.expectDELETE("/api/products/9/variants/3").respond 200, "data"
httpBackend.expectDELETE("/api/products/apples/variants/3/soft_delete").respond 200, "data"
scope.deleteVariant scope.products[0], scope.products[0].variants[0]
httpBackend.flush()
@@ -1159,7 +1159,7 @@ describe "AdminProductEditCtrl", ->
id: 13
name: "P1"
httpBackend.expectDELETE("/api/products/9/variants/3").respond 200, "data"
httpBackend.expectDELETE("/api/products/apples/variants/3/soft_delete").respond 200, "data"
scope.deleteVariant scope.products[0], scope.products[0].variants[0]
httpBackend.flush()
expect(scope.products[0].variants).toEqual [