Merge pull request #855 from wknet123/master

Fixed retrieving projects more than one page in repo
goharbor · Sep 30, 2016 · 899f6f9 · 899f6f9
2 parents 917e75e + 1c41087
commit 899f6f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/static/resources/js/components/details/retrieve-projects.directive.js b/static/resources/js/components/details/retrieve-projects.directive.js
@@ -31,14 +31,20 @@
     vm.target = $location.path().substr(1) || 'repositories';
 
     vm.isPublic = Number(getParameterByName('is_public', $location.absUrl()));
+
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_PAGE_SIZE = 15;
 
+    vm.page = Number(getParameterByName('page', $location.absUrl()) || DEFAULT_PAGE);
+    vm.pageSize = Number(getParameterByName('page_size', $location.absUrl()) || DEFAULT_PAGE_SIZE);
+
     vm.retrieve = retrieve;
     vm.filterInput = '';
     vm.selectItem = selectItem;  
     vm.checkProjectMember = checkProjectMember;  
 
     function retrieve() {
-      ListProjectService(vm.projectName, vm.isPublic)
+      ListProjectService(vm.projectName, vm.isPublic, vm.page, vm.pageSize)
         .success(getProjectSuccess)
         .error(getProjectFailed);
     }
@@ -58,7 +64,6 @@
 
     function getProjectSuccess(data, status) {
       vm.projects = data || [];
-
       if(vm.projects.length == 0 && vm.isPublic === 0){
         $window.location.href = '/project';  
       }

diff --git a/static/resources/js/components/loading-progress/loading-progress.directive.js b/static/resources/js/components/loading-progress/loading-progress.directive.js
@@ -41,8 +41,6 @@
 
       var hideTarget = convertToBoolean(scope.hideTarget);
 
-      console.log('loading-progress, toggleInProgress:' + scope.toggleInProgress + ', hideTarget:' + hideTarget);
-
       var pristine = element.html();
 
       scope.$watch('toggleInProgress', function(current) {

diff --git a/views/project.htm b/views/project.htm
@@ -59,7 +59,7 @@ <h4 class="page-header">
                     <td colspan="5" height="320px" class="empty-hint" ng-if="vm.projects.length === 0"><h4 class="text-muted">// 'no_projects_add_new_project' | tr //</h4></td>
                   </tr>
                   <tr ng-if="vm.projects.length > 0" ng-repeat="p in vm.projects">
-                    <td width="20%"><a href="/repository#/repositories?project_id=//p.project_id//&is_public=//p.public//">//p.name//</a></td>
+                    <td width="20%"><a href="/repository#/repositories?page=//vm.page//&page_size=//vm.pageSize//&project_id=//p.project_id//&is_public=//p.public//">//p.name//</a></td>
                     <td width="15%">//p.repo_count//</td>
                     <td width="15%" ng-if="vm.isPublic === 0">//vm.getProjectRole(p.current_user_role_id) | tr//</td>
                     <td width="20%">//p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>