Merge branch 'master' into 'master'

nuevo resolve modalNotaPedido See merge request modulos-npm/foca-crear-nota-pedido!86

Merge branch 'master' into 'master'
nuevo resolve modalNotaPedido See merge request modulos-npm/foca-crear-nota-pedido!86
Pablo Marco del Pont
2 parents 4cb41e811c 6f4cb42aba
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -240,7 +240,8 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                         ariaLabelledBy: 'Busqueda de Nota de Pedido',
                         templateUrl: 'foca-modal-nota-pedido.html',
                         controller: 'focaModalNotaPedidoController',
-                        size: 'lg'
+                        size: 'lg',
+                        resolve: {usadoPor: 'notaPedido'}
                     }
                 );
                 modalInstance.result.then(
...	...	@@ -240,7 +240,8 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
240	240	ariaLabelledBy: 'Busqueda de Nota de Pedido',
241	241	templateUrl: 'foca-modal-nota-pedido.html',
242	242	controller: 'focaModalNotaPedidoController',
243		- size: 'lg'
	243	+ size: 'lg',
	244	+ resolve: {usadoPor: 'notaPedido'}
244	245	}
245	246	);
246	247	modalInstance.result.then(