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

WIP: minor fixes to bulk product update js

Browse Source
This commit is contained in:
Rob H
2013-05-15 14:17:36 +05:30
committed by Rohan Mitchell
parent 3c57680303
commit 6b097eb9f8
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/bulk_product_update.js
View File

@@ -1,4 +1,4 @@
function AdminBulkProductsCtrl($scope, $http) {
function AdminBulkProductsCtrl($scope, $timeout, $http) {
$scope.refreshSuppliers = function(){
$http.get('/enterprises/suppliers.json').success(function(data) {
$scope.suppliers = data;
@@ -32,11 +32,11 @@ function AdminBulkProductsCtrl($scope, $http) {
$scope.displaySuccess();
}
else{
$scope.displayFailure("Product lists do not match");
$scope.displayFailure("Product lists do not match.");
}
})
.error(function(status){
$scope.displayFailure("Server returned an error: "+status);
.error(function(data,status){
$scope.displayFailure("Server returned with error status: "+status);
});
}
@@ -63,7 +63,7 @@ function AdminBulkProductsCtrl($scope, $http) {
}
$scope.displayFailure = function(failMessage){
$scope.setMessage($scope.updateStatusMessage,"Updating failed: "+failMessage,{ color: "red" },10000);
$scope.setMessage($scope.updateStatusMessage,"Updating failed. "+failMessage,{ color: "red" },10000);
}
}

7
spec/javascripts/unit/bulk_product_update_spec.js
View File

@@ -139,11 +139,13 @@ describe("Auxillary functions", function(){
describe("AdminBulkProductsCtrl", function(){
ctrl = null;
scope = null;
timeout = null;
httpBackend = null;
supplierController = null;
beforeEach(inject(function($controller,$rootScope,$httpBackend) {
beforeEach(inject(function($controller,$rootScope,$timeout,$httpBackend) {
scope = $rootScope.$new();
timeout = $timeout;
ctrl = $controller;
httpBackend = $httpBackend;
}));
@@ -326,12 +328,11 @@ describe("AdminBulkProductsCtrl", function(){
beforeEach(function(){
httpBackend.expectGET('/enterprises/suppliers.json').respond("list of suppliers");
httpBackend.expectGET('/admin/products/bulk_index.json').respond("list of products");
ctrl('AdminBulkProductsCtrl', { $scope: scope } );
ctrl('AdminBulkProductsCtrl', { $scope: scope, $timeout: timeout } );
httpBackend.flush();
});
it("submits products to be updated with a http post request to /admin/products/bulk_update", function(){
spyOn(scope, "displaySuccess");
httpBackend.expectPOST('/admin/products/bulk_update').respond("list of products");
scope.updateProducts("list of products");
httpBackend.flush();