Merge branch 'master' into 'master'

resolve como funcion See merge request modulos-npm/foca-crear-remito!18

Merge branch 'master' into 'master'
resolve como funcion See merge request modulos-npm/foca-crear-remito!18
Pablo Marco del Pont
2 parents a64c4d9fca ba93008bf5
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -88,7 +88,7 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                         templateUrl: 'foca-modal-nota-pedido.html',
                         controller: 'focaModalNotaPedidoController',
                         size: 'lg',
-                        resolve: {usadoPor: 'remito'}
+                        resolve: {usadoPor: function() {return 'remito';}}
                     }
                 );
                 modalInstance.result.then(
...	...	@@ -88,7 +88,7 @@ angular.module('focaCrearRemito') .controller('remitoController',
88	88	templateUrl: 'foca-modal-nota-pedido.html',
89	89	controller: 'focaModalNotaPedidoController',
90	90	size: 'lg',
91		- resolve: {usadoPor: 'remito'}
	91	+ resolve: {usadoPor: function() {return 'remito';}}
92	92	}
93	93	);
94	94	modalInstance.result.then(