Merge branch 'master' into 'master'

Master See merge request !29

Merge branch 'master' into 'master'
Master See merge request !29
Nicolás Guarnieri
2 parents b1ce2ece05 e3a979164a
Showing 3 changed files Show diff stats
src/js/controller.js
src/js/controllerCisterna.js
src/js/service.js
@@ -175,12 +175,12 @@ angular.module(&#39;focaAbmVehiculo&#39;)
                         delete $scope.vehiculo.cisternas;
                         focaAbmVehiculoService.guardarVehiculo($scope.vehiculo)
                             .then(function(res) {
-                                if($scope.nuevo) {
+                                if ($scope.nuevo) {
                                     $location.path('/vehiculo/' + res.data.id +
                                         '/' + res.data.idTransportista);
-                                }else {
+                                } else {
                                     guardarCisternas().then(function() {
-                                        $window.location.assign('/#!/vehiculo');
+                                        $location.path('/vehiculo');
                                     });
                                 }
                             });
@@ -65,9 +65,11 @@ angular.module(&#39;focaAbmVehiculo&#39;)
  
                         focaAbmVehiculoService
                             .guardarCisterna($scope.cisterna, $routeParams.idx);
-                            
-                        $window.location.assign('/#!/vehiculo/' + $routeParams.idVehiculo +
-                        '/' + $scope.transportista);
+                        
+                        $timeout(function() {
+                            $location.path('/vehiculo/' + $routeParams.idVehiculo +
+                                '/' + $scope.transportista);
+                        }, 0);
                     }, function(err) {
                         focaModalService.alert(err);
                     });
@@ -31,7 +31,7 @@ angular.module(&#39;focaAbmVehiculo&#39;)
                 }
             },
             guardarCisterna: function(cisterna, idx) {
-                if(idx !== -1) {
+                if(idx !== '-1') {
                     //update
                     cisternas[idx] = cisterna;
                 }else {
...	...	@@ -175,12 +175,12 @@ angular.module('focaAbmVehiculo')
175	175	delete $scope.vehiculo.cisternas;
176	176	focaAbmVehiculoService.guardarVehiculo($scope.vehiculo)
177	177	.then(function(res) {
178		- if($scope.nuevo) {
	178	+ if ($scope.nuevo) {
179	179	$location.path('/vehiculo/' + res.data.id +
180	180	'/' + res.data.idTransportista);
181		- }else {
	181	+ } else {
182	182	guardarCisternas().then(function() {
183		- $window.location.assign('/#!/vehiculo');
	183	+ $location.path('/vehiculo');
184	184	});
185	185	}
186	186	});
...	...	@@ -65,9 +65,11 @@ angular.module('focaAbmVehiculo')
65	65
66	66	focaAbmVehiculoService
67	67	.guardarCisterna($scope.cisterna, $routeParams.idx);
68		-
69		- $window.location.assign('/#!/vehiculo/' + $routeParams.idVehiculo +
70		- '/' + $scope.transportista);
	68	+
	69	+ $timeout(function() {
	70	+ $location.path('/vehiculo/' + $routeParams.idVehiculo +
	71	+ '/' + $scope.transportista);
	72	+ }, 0);
71	73	}, function(err) {
72	74	focaModalService.alert(err);
73	75	});
...	...	@@ -31,7 +31,7 @@ angular.module('focaAbmVehiculo')
31	31	}
32	32	},
33	33	guardarCisterna: function(cisterna, idx) {
34		- if(idx !== -1) {
	34	+ if(idx !== '-1') {
35	35	//update
36	36	cisternas[idx] = cisterna;
37	37	}else {