upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 23:59:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

update for checking member when switching sub tabs in details.

Browse Source
This commit is contained in:
kunw 2016-07-05 16:12:20 +08:00
parent e342410749
commit e2cf967195
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,10 @@
vm.publicity = current ? true : false;
vm.isPublic = vm.publicity ? 1 : 0;
vm.projectType = (vm.isPublic === 1) ? 'public_projects' : 'my_projects';
if(vm.publicity) {
vm.isProjectMember = false;
vm.target = 'repository';
}
vm.retrieve();
});
@ -91,7 +95,6 @@
$scope.$on('$locationChangeSuccess', function(e) {
var projectId = getParameterByName('project_id', $location.absUrl());
vm.checkProjectMember(projectId);
vm.isOpen = false;
});
@ -107,12 +110,7 @@
}
function getCurrentProjectMemberFailed(data, status) {
vm.isProjectMember = false;
// $scope.$emit('modalTitle', $filter('tr')('error'));
// $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project_member'));
// $scope.$emit('raiseError', true);
vm.isProjectMember = false;
console.log('Current user has no member for the project:' + status + ', location.url:' + $location.url());
}

9
static/resources/js/components/log/list-log.directive.js
View File

@ -40,6 +40,11 @@
retrieve(vm.queryParams);
$scope.$on('$locationChangeSuccess', function() {
if(vm.publicity) {
vm.target = 'repositories';
}
vm.projectId = getParameterByName('project_id', $location.absUrl());
vm.queryParams = {
'beginTimestamp' : vm.beginTimestamp,
@ -128,7 +133,9 @@
restrict: 'E',
templateUrl: '/static/resources/js/components/log/list-log.directive.html',
scope: {
'sectionHeight': '='
'sectionHeight': '=',
'target': '=',
'publicity': '='
},
controller: ListLogController,
controllerAs: 'vm',

10
static/resources/js/components/project-member/list-project-member.directive.js
View File

@ -78,10 +78,11 @@
function getProjectMemberFailed(response) {
console.log('Failed to get project members:' + response);
vm.projectMembers = [];
vm.target = 'repositories';
// $scope.$emit('modalTitle', $filter('tr')('error'));
// $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project_member'));
// $scope.$emit('raiseError', true);
$scope.$emit('modalTitle', $filter('tr')('error'));
$scope.$emit('modalMessage', $filter('tr')('failed_to_get_project_member'));
$scope.$emit('raiseError', true);
$location.url('repositories').search('project_id', vm.projectId);
}
@ -93,7 +94,8 @@
'restrict': 'E',
'templateUrl': '/static/resources/js/components/project-member/list-project-member.directive.html',
'scope': {
'sectionHeight': '='
'sectionHeight': '=',
'target': '='
},
'controller': ListProjectMemberController,
'controllerAs': 'vm',

4
views/repository.htm
View File

@ -22,8 +22,8 @@
<input type="hidden" id="HarborRegUrl" value="{{.HarborRegUrl}}">
<list-repository ng-if="vm.target === 'repositories'" section-height="vm.sectionHeight"></list-repository>
<list-replication ng-if="vm.target === 'replication'" section-height="vm.sectionHeight"></list-replication>
<list-project-member ng-if="vm.target === 'users'" section-height="vm.sectionHeight"></list-project-member>
<list-log ng-if="vm.target === 'logs'" section-height="vm.sectionHeight"></list-log>
<list-project-member ng-if="vm.target === 'users'" section-height="vm.sectionHeight" target="vm.target"></list-project-member>
<list-log ng-if="vm.target === 'logs'" section-height="vm.sectionHeight" target="vm.target" publicity="vm.publicity"></list-log>
</div>
</div>
</div>