diff --git a/src/js/controllerModal.js b/src/js/controllerModal.js index cce6f4d..940eced 100644 --- a/src/js/controllerModal.js +++ b/src/js/controllerModal.js @@ -5,17 +5,11 @@ angular.module('focaModal') '$scope', '$uibModalInstance', 'focaModalService', - 'columnas', - 'query', - 'titulo', - 'size', - function($timeout, $filter, $scope, $uibModalInstance, focaModalService, - columnas, query, titulo, size) { - - $scope.size = size; + 'parametrosModal', + function($timeout, $filter, $scope, $uibModalInstance, focaModalService, parametrosModal) { + + $scope.parametrosModal = parametrosModal; $scope.filters = ''; - $scope.columnas = columnas; - $scope.titulo = titulo; $scope.entidades = []; $scope.primerBusqueda = false; $scope.searchLoading = false; @@ -29,7 +23,7 @@ angular.module('focaModal') $scope.busquedaPress = function(key) { if(key === 13) { $scope.searchLoading = true; - focaModalService.getEntidad($scope.filters, query).then( + focaModalService.getEntidad($scope.filters, parametrosModal.query).then( function(res) { $scope.searchLoading = false; $scope.primerBusqueda = true; diff --git a/src/js/service.js b/src/js/service.js index 3315725..0e81375 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -31,18 +31,16 @@ angular.module('focaModal') } ); }, - modal: function(columnas, query, titulo, size) { - size = (typeof size === 'undefined') ? 'lg' : size; + modal: function(parametrosModal) { + parametrosModal.size = (typeof parametrosModal.size === 'undefined') ? + 'lg' : parametrosModal.size; return $uibModal.open({ templateUrl: 'foca-modal.html', controller: 'focaModalController', - size: size, + size: parametrosModal.size, resolve: { - columnas: function() { return columnas; }, - query: function() { return query; }, - titulo: function() { return titulo; }, - size: function() { return size; } + parametrosModal: function() { return parametrosModal; } } }) .result.then( diff --git a/src/views/foca-modal.html b/src/views/foca-modal.html index 67bd19c..15b6a43 100644 --- a/src/views/foca-modal.html +++ b/src/views/foca-modal.html @@ -1,9 +1,10 @@