Merge branch 'master' into 'master'

Master(efernandez) See merge request !5

Merge branch 'master' into 'master'
Master(efernandez) See merge request !5
Eric Fernandez
2 parents f776fcedbf f6b96806bf
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -63,7 +63,9 @@ angular.module(&#39;focaModalDetalleHojaRuta&#39;)
                         focaModalService
                             .confirm('¿Desea descargar ' + totalADescargar + ' litros de ' +
                             $scope.articuloSeleccionado.descripcion + '?')
-                            .then(descargar);
+                            .then(descargar, function() {
+                                $scope.cargando = false;
+                            });
                     }
                     function descargar() {
                         for(var i = 0; i < $scope.cisternas.length; i++) {
...	...	@@ -63,7 +63,9 @@ angular.module('focaModalDetalleHojaRuta')
63	63	focaModalService
64	64	.confirm('¿Desea descargar ' + totalADescargar + ' litros de ' +
65	65	$scope.articuloSeleccionado.descripcion + '?')
66		- .then(descargar);
	66	+ .then(descargar, function() {
	67	+ $scope.cargando = false;
	68	+ });
67	69	}
68	70	function descargar() {
69	71	for(var i = 0; i < $scope.cisternas.length; i++) {