From 652ff80518140fea897e2800a4d4837f5c3d6c40 Mon Sep 17 00:00:00 2001 From: denz Date: Thu, 9 Feb 2017 15:00:52 +0900 Subject: [PATCH] fixed a problem where favorites list was displayed incorrectly --- web/src/main/webapp/features/navbar/navbar.directive.js | 3 ++- .../pages/transactionList/transaction-list.controller.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/src/main/webapp/features/navbar/navbar.directive.js b/web/src/main/webapp/features/navbar/navbar.directive.js index a4a7d3ecf..2d0427ac0 100644 --- a/web/src/main/webapp/features/navbar/navbar.directive.js +++ b/web/src/main/webapp/features/navbar/navbar.directive.js @@ -397,7 +397,7 @@ */ parseApplicationList = function (data, cb) { UserConfigService.getFavoriteList(function( aSavedFavoriteList ){ - scope.favoriteCount = aSavedFavoriteList.length; + // scope.favoriteCount = aSavedFavoriteList.length; scope.applications = [{ text: '', value: '' @@ -422,6 +422,7 @@ aGeneralList.push(oValue); } }); + scope.favoriteCount = aFavoriteList.length; scope.applications = aFavoriteList.concat( aGeneralList ); if (angular.isFunction(cb)) { cb.apply(scope); diff --git a/web/src/main/webapp/pages/transactionList/transaction-list.controller.js b/web/src/main/webapp/pages/transactionList/transaction-list.controller.js index d9f273a72..a4cab0841 100644 --- a/web/src/main/webapp/pages/transactionList/transaction-list.controller.js +++ b/web/src/main/webapp/pages/transactionList/transaction-list.controller.js @@ -250,7 +250,7 @@ fetchStart = function ( bHasTransactionInfo ) { var query = getQuery(); getTransactionList(query, function (data) { - if (data.metadata.length === 0 || true) { + if (data.metadata.length === 0) { $scope.$emit('timeSliderDirective.disableMore'); $scope.$emit('timeSliderDirective.changeMoreToDone'); if ( fetchStartLoadTryCount < fetchStartLoadTryMaxCount ) {