Merge branch 'master' into 'master'

pequeño error See merge request modulos-npm/foca-modal-proveedor!8

Merge branch 'master' into 'master'
pequeño error See merge request modulos-npm/foca-modal-proveedor!8
Eric Fernandez
2 parents ddbe0e5c3f e7f7c2656f
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -38,15 +38,17 @@ angular.module(&#39;focaModalProveedor&#39;)
             };
  
             $scope.search = function () {
-                $scope.filteredProveedores = $filter('filter')(
-                    $scope.proveedores, {$: $scope.filters}
-                );
+                if($scope.primerBusqueda) {
+                    $scope.filteredProveedores = $filter('filter')(
+                        $scope.proveedores, {$: $scope.filters}
+                    );
  
-                $scope.lastPage = Math.ceil(
-                    $scope.filteredProveedores.length / $scope.numPerPage
-                );
+                    $scope.lastPage = Math.ceil(
+                        $scope.filteredProveedores.length / $scope.numPerPage
+                    );
  
-                $scope.resetPage();
+                    $scope.resetPage();
+                }
             };
  
             $scope.resetPage = function () {
...	...	@@ -38,15 +38,17 @@ angular.module('focaModalProveedor')
38	38	};
39	39
40	40	$scope.search = function () {
41		- $scope.filteredProveedores = $filter('filter')(
42		- $scope.proveedores, {$: $scope.filters}
43		- );
	41	+ if($scope.primerBusqueda) {
	42	+ $scope.filteredProveedores = $filter('filter')(
	43	+ $scope.proveedores, {$: $scope.filters}
	44	+ );
44	45
45		- $scope.lastPage = Math.ceil(
46		- $scope.filteredProveedores.length / $scope.numPerPage
47		- );
	46	+ $scope.lastPage = Math.ceil(
	47	+ $scope.filteredProveedores.length / $scope.numPerPage
	48	+ );
48	49
49		- $scope.resetPage();
	50	+ $scope.resetPage();
	51	+ }
50	52	};
51	53
52	54	$scope.resetPage = function () {