diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js index 6b628205d8d2929c2a1f5101f28864a573e92db5..8cf40b7ec0b8e4f2f664f6e3ee0a05ecb5987456 100644 --- a/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js +++ b/apollo-portal/src/main/resources/static/scripts/controller/config/ReleaseHistoryController.js @@ -24,15 +24,16 @@ release_history_module.controller("ReleaseHistoryController", var hasFindActiveRelease = false; function findReleases(page) { + var size = 10; ReleaseService.findAllRelease($scope.pageContext.appId, $scope.pageContext.env, $scope.pageContext.clusterName, $scope.pageContext.namespaceName, - page) + page, + size) .then(function (result) { - if (!result || result.length == 0) { + if (!result || result.length < size) { $scope.hasLoadAll = true; - return; } var hasParseNamespaceType = false; 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 5ad831ae75f05851aeba9c9e6fa6fcffc9777ac1..fcf24cf3d18878b19f29d62ed38a727ea307e3b1 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 @@ -166,15 +166,19 @@ directive_module.directive('apollonspanel', namespace.commits = []; namespace.commitPage = 0; } + + var size = 10; CommitService.find_commits(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, - namespace.commitPage) + namespace.commitPage, + size) .then(function (result) { - if (result.length == 0) { + if (result.length < size) { namespace.hasLoadAllCommit = true; } + for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); @@ -418,7 +422,6 @@ directive_module.directive('apollonspanel', return true; } - } } }); diff --git a/apollo-portal/src/main/resources/static/scripts/services/CommitService.js b/apollo-portal/src/main/resources/static/scripts/services/CommitService.js index ccdc1c075179853e514cd73858c07079d37b5428..b0137fa8fec6b82127aa23b6f228d25d0a99ac7c 100644 --- a/apollo-portal/src/main/resources/static/scripts/services/CommitService.js +++ b/apollo-portal/src/main/resources/static/scripts/services/CommitService.js @@ -7,14 +7,15 @@ appService.service('CommitService', ['$resource', '$q', function ($resource, $q) } }); return { - find_commits: function (appId, env, clusterName, namespaceName, page) { + find_commits: function (appId, env, clusterName, namespaceName, page, size) { var d = $q.defer(); commit_resource.find_commits({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, - page: page + page: page, + size: size }, function (result) { d.resolve(result); diff --git a/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js b/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js index cd0edb7dac03407ad6410409fcb42df7d32f2716..ff43936be59f4f5fc15bae5be6bafd35875d3abe 100644 --- a/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js +++ b/apollo-portal/src/main/resources/static/scripts/services/ReleaseService.js @@ -42,14 +42,15 @@ appService.service('ReleaseService', ['$resource', '$q', function ($resource, $q return d.promise; } - function findAllReleases(appId, env, clusterName, namespaceName, page) { + function findAllReleases(appId, env, clusterName, namespaceName, page, size) { var d = $q.defer(); resource.find_all_releases({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, - page: page + page: page, + size: size }, function (result) { d.resolve(result); }, function (result) {