From 035730a753677e169c9a4fd2fdfd894e3d40c7ba Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Wed, 26 Dec 2018 16:33:47 -0300 Subject: [PATCH] Auto stash before merge of "master" and "upstream/master" --- src/js/controller.js | 3 ++- src/views/modal-vehiculo.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index 12eae6b..19d2cc1 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -42,13 +42,14 @@ angular.module('focaModalVehiculo') {$: $scope.filters} ); - if(pressed && $scope.filteredVehiculos.length === 0) { + if(pressed && $scope.filteredVehiculos.length === 0){ $timeout(function() { angular.element('#search')[0].focus(); $scope.filters = ''; }); } + $scope.lastPage = Math.ceil( $scope.filteredVehiculos.length / $scope.numPerPage ); diff --git a/src/views/modal-vehiculo.html b/src/views/modal-vehiculo.html index 049d56d..d674a19 100644 --- a/src/views/modal-vehiculo.html +++ b/src/views/modal-vehiculo.html @@ -7,9 +7,9 @@