Merge branch 'master' into 'master'

master(efernandez) See merge request modulos-npm/foca-modal-vendedores!9

Merge branch 'master' into 'master'
master(efernandez) See merge request modulos-npm/foca-modal-vendedores!9
Pablo Marco del Pont
2 parents 59965646b6 039ef7d52b
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/modal-vendedores.html
@@ -17,10 +17,10 @@ angular.module(&#39;focaModalVendedores&#39;)
             $scope.selectedVendedor = -1;
  
             $scope.busquedaPress = function(key) {
-                if (key === 13) {
-                    $scope.primerBusqueda = true;
+                if (key === 13) {                    
                     focaVendedoresService.getVendedores($scope.filters).then(
                         function(res) {
+                            $scope.primerBusqueda = true;
                             $scope.vendedores = res.data;
                             $scope.search();
                             primera();
@@ -29,7 +29,7 @@
             </tr>
         </thead>
         <tbody>
-            <tr ng-show="currentPageVendedores.length == 0">
+            <tr ng-show="currentPageVendedores.length == 0 && primerBusqueda">
                 <td colspan="3">
                     No se encontraron resultados.
                 </td>
@@ -84,8 +84,6 @@
             </li>
         </ul>
     </nav>
-
-
 </div>
 <div class="modal-footer py-1">
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
...	...	@@ -17,10 +17,10 @@ angular.module('focaModalVendedores')
17	17	$scope.selectedVendedor = -1;
18	18
19	19	$scope.busquedaPress = function(key) {
20		- if (key === 13) {
21		- $scope.primerBusqueda = true;
	20	+ if (key === 13) {
22	21	focaVendedoresService.getVendedores($scope.filters).then(
23	22	function(res) {
	23	+ $scope.primerBusqueda = true;
24	24	$scope.vendedores = res.data;
25	25	$scope.search();
26	26	primera();
...	...	@@ -29,7 +29,7 @@
29	29	</tr>
30	30	</thead>
31	31	<tbody>
32		- <tr ng-show="currentPageVendedores.length == 0">
	32	+ <tr ng-show="currentPageVendedores.length == 0 && primerBusqueda">
33	33	<td colspan="3">
34	34	No se encontraron resultados.
35	35	</td>
...	...	@@ -84,8 +84,6 @@
84	84	</li>
85	85	</ul>
86	86	</nav>
87		-
88		-
89	87	</div>
90	88	<div class="modal-footer py-1">
91	89	<button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>