Merge branch 'master' into 'develop'

Master(efernandez) See merge request !11

Merge branch 'master' into 'develop'
Master(efernandez) See merge request !11
Eric Fernandez
2 parents 23f6684449 7491426182
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -47,7 +47,9 @@ angular.module(&#39;focaHojaRuta&#39;)
                             templateUrl: 'modal-detalle-hoja-ruta.html',
                             controller: 'focaModalDetalleHojaRutaController',
                             resolve: {
-                                idRemito : function() {return remito.id;}
+                                parametros: {
+                                    remito: remito,
+                                }
                             },
                             size: 'lg'
                         }
...	...	@@ -47,7 +47,9 @@ angular.module('focaHojaRuta')
47	47	templateUrl: 'modal-detalle-hoja-ruta.html',
48	48	controller: 'focaModalDetalleHojaRutaController',
49	49	resolve: {
50		- idRemito : function() {return remito.id;}
	50	+ parametros: {
	51	+ remito: remito,
	52	+ }
51	53	},
52	54	size: 'lg'
53	55	}