mirror of
https://github.com/goharbor/harbor.git
synced 2024-10-01 06:47:33 +02:00
Merge pull request #763 from wknet123/dev
Update for loading requests of UI when retrieving project details..
This commit is contained in:
commit
37a39a6eac
@ -102,12 +102,13 @@
|
|||||||
function selectItem(item) {
|
function selectItem(item) {
|
||||||
vm.selectedProject = item;
|
vm.selectedProject = item;
|
||||||
$location.search('project_id', vm.selectedProject.project_id);
|
$location.search('project_id', vm.selectedProject.project_id);
|
||||||
vm.checkProjectMember(vm.selectedProject.project_id);
|
$scope.$emit('projectChanged', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.$on('$locationChangeSuccess', function(e) {
|
$scope.$on('$locationChangeSuccess', function(e) {
|
||||||
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
||||||
vm.isOpen = false;
|
vm.isOpen = false;
|
||||||
|
vm.checkProjectMember(vm.selectedProject.project_id);
|
||||||
});
|
});
|
||||||
|
|
||||||
function checkProjectMember(projectId) {
|
function checkProjectMember(projectId) {
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
<span class="input-group-btn">
|
<span class="input-group-btn">
|
||||||
<button class="btn btn-primary" type="button" ng-click="vm.search({op: vm.op, username: vm.username})"><span class="glyphicon glyphicon-search"></span></button>
|
<button class="btn btn-primary" type="button" ng-click="vm.search({op: vm.op, username: vm.username})"><span class="glyphicon glyphicon-search"></span></button>
|
||||||
</span>
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="input-group">
|
||||||
<span class="input-group-btn">
|
<span class="input-group-btn">
|
||||||
<button class="btn btn-link" type="button" ng-click="vm.showAdvancedSearch()">// 'advanced_search' | tr //</button>
|
<button class="btn btn-link" type="button" ng-click="vm.showAdvancedSearch()">// 'advanced_search' | tr //</button>
|
||||||
</span>
|
</span>
|
||||||
|
@ -62,8 +62,8 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$scope.$on('$locationChangeSuccess', function() {
|
$scope.$on('retrieveData', function(e, val) {
|
||||||
|
if(val) {
|
||||||
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
||||||
vm.queryParams = {
|
vm.queryParams = {
|
||||||
'beginTimestamp' : vm.beginTimestamp,
|
'beginTimestamp' : vm.beginTimestamp,
|
||||||
@ -74,6 +74,7 @@
|
|||||||
};
|
};
|
||||||
vm.username = '';
|
vm.username = '';
|
||||||
retrieve(vm.queryParams, vm.page, vm.pageSize);
|
retrieve(vm.queryParams, vm.page, vm.pageSize);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function search(e) {
|
function search(e) {
|
||||||
|
@ -40,10 +40,13 @@
|
|||||||
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
||||||
vm.retrieve();
|
vm.retrieve();
|
||||||
|
|
||||||
$scope.$on('$locationChangeSuccess', function() {
|
$scope.$on('retrieveData', function(e, val) {
|
||||||
|
if(val) {
|
||||||
|
console.log('received retrieve data:' + val);
|
||||||
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
||||||
vm.username = '';
|
vm.username = '';
|
||||||
vm.retrieve();
|
vm.retrieve();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function search(e) {
|
function search(e) {
|
||||||
|
@ -44,9 +44,11 @@
|
|||||||
|
|
||||||
vm.sectionHeight = {'min-height': '1260px'};
|
vm.sectionHeight = {'min-height': '1260px'};
|
||||||
|
|
||||||
$scope.$on('$locationChangeSuccess', function() {
|
$scope.$on('retrieveData', function(e, val) {
|
||||||
|
if(val) {
|
||||||
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
||||||
vm.retrievePolicy();
|
vm.retrievePolicy();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
vm.addReplication = addReplication;
|
vm.addReplication = addReplication;
|
||||||
@ -66,7 +68,7 @@
|
|||||||
vm.page = 1;
|
vm.page = 1;
|
||||||
|
|
||||||
$scope.$watch('vm.page', function(current) {
|
$scope.$watch('vm.page', function(current) {
|
||||||
if(current !== 1) {
|
if(vm.lastPolicyId !== -1 && current) {
|
||||||
vm.page = current;
|
vm.page = current;
|
||||||
console.log('replication job: vm.page:' + current);
|
console.log('replication job: vm.page:' + current);
|
||||||
vm.retrieveJob(vm.lastPolicyId, vm.page, vm.pageSize);
|
vm.retrieveJob(vm.lastPolicyId, vm.page, vm.pageSize);
|
||||||
@ -192,7 +194,11 @@
|
|||||||
|
|
||||||
function deleteReplicationPolicyFailed(data, status) {
|
function deleteReplicationPolicyFailed(data, status) {
|
||||||
$scope.$emit('modalTitle', $filter('tr')('error'));
|
$scope.$emit('modalTitle', $filter('tr')('error'));
|
||||||
|
if(status === 412) {
|
||||||
|
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_replication_enabled'));
|
||||||
|
}else{
|
||||||
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_replication_policy'));
|
$scope.$emit('modalMessage', $filter('tr')('failed_to_delete_replication_policy'));
|
||||||
|
}
|
||||||
$scope.$emit('raiseError', true);
|
$scope.$emit('raiseError', true);
|
||||||
console.log('Failed to delete replication policy.');
|
console.log('Failed to delete replication policy.');
|
||||||
}
|
}
|
||||||
@ -347,11 +353,7 @@
|
|||||||
if(current) {
|
if(current) {
|
||||||
if(current.length > 0) {
|
if(current.length > 0) {
|
||||||
element.find('#upon-pane table>tbody>tr').on('click', trClickHandler);
|
element.find('#upon-pane table>tbody>tr').on('click', trClickHandler);
|
||||||
if(ctrl.lastPolicyId === -1) {
|
|
||||||
element.find('#upon-pane table>tbody>tr:eq(0)').trigger('click');
|
element.find('#upon-pane table>tbody>tr:eq(0)').trigger('click');
|
||||||
}else{
|
|
||||||
element.find('#upon-pane table>tbody>tr').filter('[policy_id="' + ctrl.lastPolicyId + '"]').trigger('click');
|
|
||||||
}
|
|
||||||
}else{
|
}else{
|
||||||
element
|
element
|
||||||
.find('#upon-pane table>tbody>tr')
|
.find('#upon-pane table>tbody>tr')
|
||||||
|
@ -49,10 +49,12 @@
|
|||||||
|
|
||||||
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
||||||
|
|
||||||
$scope.$on('$locationChangeSuccess', function() {
|
$scope.$on('retrieveData', function(e, val) {
|
||||||
|
if(val) {
|
||||||
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
vm.projectId = getParameterByName('project_id', $location.absUrl());
|
||||||
vm.filterInput = '';
|
vm.filterInput = '';
|
||||||
vm.retrieve();
|
vm.retrieve();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -68,6 +68,12 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$scope.$on('projectChanged', function(e, val) {
|
||||||
|
if(val) {
|
||||||
|
$scope.$broadcast('retrieveData', true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
function togglePublicity(e) {
|
function togglePublicity(e) {
|
||||||
vm.publicity = e.publicity;
|
vm.publicity = e.publicity;
|
||||||
}
|
}
|
||||||
|
@ -253,6 +253,7 @@ var locale_messages = {
|
|||||||
'failed_to_get_replication_policy': 'Failed to get replication policy.',
|
'failed_to_get_replication_policy': 'Failed to get replication policy.',
|
||||||
'failed_to_update_replication_policy': 'Failed to update replication policy.',
|
'failed_to_update_replication_policy': 'Failed to update replication policy.',
|
||||||
'failed_to_delete_replication_policy': 'Failed to delete replication policy.',
|
'failed_to_delete_replication_policy': 'Failed to delete replication policy.',
|
||||||
|
'failed_to_delete_replication_enabled': 'Policy is enabled, can not be deleted.',
|
||||||
'failed_to_delete_destination': 'Failed to delete destination.',
|
'failed_to_delete_destination': 'Failed to delete destination.',
|
||||||
'failed_to_create_destination': 'Failed to create destination.',
|
'failed_to_create_destination': 'Failed to create destination.',
|
||||||
'failed_to_update_destination': 'Failed to update destination.',
|
'failed_to_update_destination': 'Failed to update destination.',
|
||||||
|
@ -252,6 +252,7 @@ var locale_messages = {
|
|||||||
'failed_to_get_destination_policies': '获取目标关联策略数据失败。',
|
'failed_to_get_destination_policies': '获取目标关联策略数据失败。',
|
||||||
'failed_to_get_replication_policy': '获取复制策略失败。',
|
'failed_to_get_replication_policy': '获取复制策略失败。',
|
||||||
'failed_to_update_replication_policy': '修改复制策略失败。',
|
'failed_to_update_replication_policy': '修改复制策略失败。',
|
||||||
|
'failed_to_delete_replication_enabled': '无法删除正在使用的复制策略。',
|
||||||
'failed_to_delete_replication_policy': '删除复制策略失败。',
|
'failed_to_delete_replication_policy': '删除复制策略失败。',
|
||||||
'failed_to_delete_destination': '删除目标失败。',
|
'failed_to_delete_destination': '删除目标失败。',
|
||||||
'failed_to_create_destination': '创建目标失败。',
|
'failed_to_create_destination': '创建目标失败。',
|
||||||
|
Loading…
Reference in New Issue
Block a user