From 9b5f301fb494cd09c421f53353ce3c3242f1e884 Mon Sep 17 00:00:00 2001 From: Accelerater <604916089@qq.com> Date: Sat, 14 Aug 2021 16:50:49 +0800 Subject: [PATCH 1/2] fix search history. --- .../static/scripts/directive/namespace-panel-directive.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js index d067c17d7c4..59935e8a777 100644 --- a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js +++ b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js @@ -870,6 +870,7 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio function searchHistory(namespace) { namespace.commits = []; namespace.commitPage = 0; + namespace.hasLoadAllCommit = false; var size = 10; CommitService.find_commits(scope.appId, scope.env, @@ -888,6 +889,7 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } + namespace.commitPage++ }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); From 7bc2054eb973308775003fbd3a4c4a9a23f8c7f1 Mon Sep 17 00:00:00 2001 From: Accelerater <604916089@qq.com> Date: Sat, 14 Aug 2021 16:53:33 +0800 Subject: [PATCH 2/2] add CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index b441593d17b..04f0ac9e931 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -76,6 +76,7 @@ Apollo 1.9.0 * [fix apollo config data loader with profiles](https://github.com/ctripcorp/apollo/pull/3870) * [polish log](https://github.com/ctripcorp/apollo/pull/3882) * [add history query](https://github.com/ctripcorp/apollo/pull/3878) +* [fix history query](https://github.com/ctripcorp/apollo/pull/3894) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)