Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-31 23:59:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #855 from wknet123/master

Browse Source 
Fixed retrieving projects more than one page in repo
This commit is contained in:
Daniel Jiang 2016-09-30 14:47:46 +08:00 committed by GitHub
commit 899f6f9d5b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
static/resources/js/components/details/retrieve-projects.directive.js
View File

@ -32,13 +32,19 @@
vm.isPublic = Number(getParameterByName('is_public', $location.absUrl())); 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.retrieve = retrieve;
vm.filterInput = ''; vm.filterInput = '';
vm.selectItem = selectItem; vm.selectItem = selectItem;
vm.checkProjectMember = checkProjectMember; vm.checkProjectMember = checkProjectMember;
function retrieve() { function retrieve() {
ListProjectService(vm.projectName, vm.isPublic) ListProjectService(vm.projectName, vm.isPublic, vm.page, vm.pageSize)
.success(getProjectSuccess) .success(getProjectSuccess)
.error(getProjectFailed); .error(getProjectFailed);
} }
@ -58,7 +64,6 @@
function getProjectSuccess(data, status) { function getProjectSuccess(data, status) {
vm.projects = data || []; vm.projects = data || [];
if(vm.projects.length == 0 && vm.isPublic === 0){ if(vm.projects.length == 0 && vm.isPublic === 0){
$window.location.href = '/project'; $window.location.href = '/project';
} }

2
static/resources/js/components/loading-progress/loading-progress.directive.js
View File

@ -41,8 +41,6 @@
var hideTarget = convertToBoolean(scope.hideTarget); var hideTarget = convertToBoolean(scope.hideTarget);
console.log('loading-progress, toggleInProgress:' + scope.toggleInProgress + ', hideTarget:' + hideTarget);
var pristine = element.html(); var pristine = element.html();
scope.$watch('toggleInProgress', function(current) { scope.$watch('toggleInProgress', function(current) {

2
views/project.htm
View File

@ -59,7 +59,7 @@
<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> <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>
<tr ng-if="vm.projects.length > 0" ng-repeat="p in vm.projects"> <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%">//p.repo_count//</td>
<td width="15%" ng-if="vm.isPublic === 0">//vm.getProjectRole(p.current_user_role_id) | tr//</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> <td width="20%">//p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>