Merge branch 'master' into 'master'

Master (pmarco) See merge request modulos-npm/foca-crear-nota-pedido!89

Merge branch 'master' into 'master'
Master (pmarco) See merge request modulos-npm/foca-crear-nota-pedido!89
Eric Fernandez
2 parents 8e5ea04d82 d937bb0bed
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -243,7 +243,7 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                         templateUrl: 'foca-modal-nota-pedido.html',
                         controller: 'focaModalNotaPedidoController',
                         size: 'lg',
-                        resolve: {usadoPor: 'notaPedido'}
+                        resolve: {usadoPor: function(){return 'notaPedido';}}
                     }
                 );
                 modalInstance.result.then(
...	...	@@ -243,7 +243,7 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
243	243	templateUrl: 'foca-modal-nota-pedido.html',
244	244	controller: 'focaModalNotaPedidoController',
245	245	size: 'lg',
246		- resolve: {usadoPor: 'notaPedido'}
	246	+ resolve: {usadoPor: function(){return 'notaPedido';}}
247	247	}
248	248	);
249	249	modalInstance.result.then(