raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change checkbox confirmation behaviour

Browse Source
This commit is contained in:
Matt-Yorkley
2018-02-23 14:05:08 +00:00
parent 58e9f0266a
commit c5b7cec19f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee
View File

@@ -27,12 +27,11 @@ angular.module("admin.productImport").controller "ImportOptionsFormCtrl", ($scop
$scope.toggleResetAbsent = (id) ->
checked = $scope.settings[id]['reset_all_absent']
confirmed = confirm t('js.product_import.confirmation') if resetAbsent
confirmed = confirm t('js.product_import.confirmation') if checked
if confirmed or !checked
ProductImportService.updateResetAbsent($scope.supplierId, $scope.reset_counts[$scope.supplierId], resetAbsent)
if !confirmed and checked
ProductImportService.updateResetAbsent($scope.supplierId, $scope.reset_counts[$scope.supplierId], checked)
else
$scope.settings[id]['reset_all_absent'] = false
$scope.resetTotal = ProductImportService.resetTotal

2
app/controllers/admin/product_import_controller.rb
View File

@@ -5,7 +5,7 @@ module Admin
before_filter :validate_upload_presence, except: %i[index guide validate_data]
def guide
@product_categories = Spree::Taxon.order('name ASC').pluck(:name)
@product_categories = Spree::Taxon.order('name ASC').pluck(:name).uniq
@tax_categories = Spree::TaxCategory.order('name ASC').pluck(:name)
@shipping_categories = Spree::ShippingCategory.order('name ASC').pluck(:name)
end