Merge remote-tracking branch 'upstream/master'

Jose Pinto
2 parents 2e97bc0d71 c81b204709
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -241,7 +241,12 @@ angular.module(&#39;focaCrearHojaRuta&#39;) .controller(&#39;hojaRutaCtrl&#39;,
                         ariaLabelledBy: 'Busqueda de Vehiculo',
                         templateUrl: 'modal-vehiculo.html',
                         controller: 'focaModalVehiculoController',
-                        size: 'lg'
+                        size: 'lg',
+                        resolve: {
+                            idTransportista: function() {
+                                return -1;
+                            }
+                        }
                     }
                 );
...	...	@@ -241,7 +241,12 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl',
241	241	ariaLabelledBy: 'Busqueda de Vehiculo',
242	242	templateUrl: 'modal-vehiculo.html',
243	243	controller: 'focaModalVehiculoController',
244		- size: 'lg'
	244	+ size: 'lg',
	245	+ resolve: {
	246	+ idTransportista: function() {
	247	+ return -1;
	248	+ }
	249	+ }
245	250	}
246	251	);
247	252