mirror of
https://github.com/goharbor/harbor.git
synced 2024-09-26 04:23:22 +02:00
Merge pull request #949 from wknet123/dev
Updates for link of logs on dashboard.
This commit is contained in:
Daniel Jiang
GitHub
commit
ce40b26ff2
@ -88,7 +88,6 @@
|
||||
|
||||
|
||||
function getProjectSuccess(response) {
|
||||
|
||||
var partialProjects = response.data || [];
|
||||
for(var i in partialProjects) {
|
||||
vm.projects.push(partialProjects[i]);
|
||||
@ -114,11 +113,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
$location.search('project_id', vm.selectedProject.project_id);
|
||||
vm.checkProjectMember(vm.selectedProject.project_id);
|
||||
|
||||
if(vm.selectedProject) {
|
||||
$location.search('project_id', vm.selectedProject.project_id);
|
||||
vm.checkProjectMember(vm.selectedProject.project_id);
|
||||
}
|
||||
|
||||
vm.resultCount = vm.projects.length;
|
||||
|
||||
|
||||
$scope.$watch('vm.filterInput', function(current, origin) {
|
||||
vm.resultCount = $filter('name')(vm.projects, vm.filterInput, 'name').length;
|
||||
});
|
||||
|
||||
@ -19,9 +19,9 @@
|
||||
.module('harbor.repository')
|
||||
.directive('listRepository', listRepository);
|
||||
|
||||
ListRepositoryController.$inject = ['$scope', 'ListRepositoryService', 'DeleteRepositoryService', '$filter', 'trFilter', '$location', 'getParameterByName'];
|
||||
ListRepositoryController.$inject = ['$scope', 'ListRepositoryService', 'DeleteRepositoryService', '$filter', 'trFilter', '$location', 'getParameterByName', '$window'];
|
||||
|
||||
function ListRepositoryController($scope, ListRepositoryService, DeleteRepositoryService, $filter, trFilter, $location, getParameterByName) {
|
||||
function ListRepositoryController($scope, ListRepositoryService, DeleteRepositoryService, $filter, trFilter, $location, getParameterByName, $window) {
|
||||
|
||||
$scope.subsTabPane = 30;
|
||||
|
||||
@ -104,7 +104,23 @@
|
||||
}
|
||||
|
||||
function getRepositoryFailed(response) {
|
||||
console.log('Failed to list repositories:' + response);
|
||||
var errorMessage = '';
|
||||
if(response.status === 404) {
|
||||
errorMessage = $filter('tr')('project_does_not_exist');
|
||||
}else{
|
||||
errorMessage = $filter('tr')('failed_to_get_project');
|
||||
}
|
||||
$scope.$emit('modalTitle', $filter('tr')('error'));
|
||||
$scope.$emit('modalMessage', errorMessage);
|
||||
var emitInfo = {
|
||||
'confirmOnly': true,
|
||||
'contentType': 'text/html',
|
||||
'action' : function() {
|
||||
$window.location.href = '/dashboard';
|
||||
}
|
||||
};
|
||||
$scope.$emit('raiseInfo', emitInfo);
|
||||
console.log('Failed to list repositories:' + response.data);
|
||||
}
|
||||
|
||||
function searchRepo() {
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
</tr>
|
||||
<tr ng-if="vm.integratedLogs.length > 0" ng-repeat="t in vm.integratedLogs">
|
||||
<td width="18%">//t.username//</td>
|
||||
<td width="28%"><a href="javascript:void(0);" ng-click="vm.gotoLog(t.project_id, t.username)">//t.repo_name//</a></td>
|
||||
<td width="28%"><a href="javascript:void(0);" ng-click="vm.gotoRepo(t.project_id, t.repo_name)">//t.repo_name//</a></td>
|
||||
<td width="15%">//t.repo_tag//</td>
|
||||
<td width="14%">//t.operation//</td>
|
||||
<td width="25%">//t.op_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
.success(listIntegratedLogSuccess)
|
||||
.error(listIntegratedLogFailed);
|
||||
|
||||
vm.gotoLog = gotoLog;
|
||||
vm.gotoRepo = gotoRepo;
|
||||
|
||||
function listIntegratedLogSuccess(data) {
|
||||
vm.integratedLogs = data || [];
|
||||
@ -42,8 +42,8 @@
|
||||
console.log('Failed to get user logs:' + data);
|
||||
}
|
||||
|
||||
function gotoLog(projectId, username) {
|
||||
$window.location.href = '/repository#/logs?project_id=' + projectId + '#' + encodeURIComponent(username);
|
||||
function gotoRepo(projectId, repoName) {
|
||||
$window.location.href = '/repository#/repositories?project_id=' + projectId + '#' + encodeURIComponent(repoName);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -233,6 +233,7 @@ var locale_messages = {
|
||||
'failed_to_get_project_member': 'Failed to get current project member.',
|
||||
'failed_to_delete_repo': 'Failed to delete repository. ',
|
||||
'failed_to_delete_repo_insuffient_permissions': 'Failed to delete repository, insuffient permissions.',
|
||||
'failed_to_get_repo': 'Failed to get repositories.',
|
||||
'failed_to_get_tag': 'Failed to get tag.',
|
||||
'failed_to_get_log': 'Failed to get logs.',
|
||||
'failed_to_get_project': 'Failed to get projects.',
|
||||
@ -263,6 +264,7 @@ var locale_messages = {
|
||||
'failed_to_update_destination': 'Failed to update destination.',
|
||||
'failed_to_toggle_publicity_insuffient_permissions': 'Failed to toggle project publicity, insuffient permissions.',
|
||||
'failed_to_toggle_publicity': 'Failed to toggle project publicity.',
|
||||
'project_does_not_exist': 'Project does not exist.',
|
||||
'project_admin': 'Project Admin',
|
||||
'developer': 'Developer',
|
||||
'guest': 'Guest',
|
||||
|
||||
@ -233,6 +233,7 @@ var locale_messages = {
|
||||
'failed_to_get_project_member': '无法获取当前项目成员。',
|
||||
'failed_to_delete_repo': '无法删除镜像仓库。',
|
||||
'failed_to_delete_repo_insuffient_permissions': '无法删除镜像仓库，权限不足。',
|
||||
'failed_to_get_repo': '获取镜像仓库数据失败。',
|
||||
'failed_to_get_tag': '获取标签数据失败。',
|
||||
'failed_to_get_log': '获取日志数据失败。',
|
||||
'failed_to_get_project': '获取项目数据失败。',
|
||||
@ -263,6 +264,7 @@ var locale_messages = {
|
||||
'failed_to_update_destination': '修改目标失败。',
|
||||
'failed_to_toggle_publicity_insuffient_permissions': '切换项目公开性失败，权限不足。',
|
||||
'failed_to_toggle_publicity': '切换项目公开性失败。',
|
||||
'project_does_not_exist': '项目不存在。',
|
||||
'project_admin': '项目管理员',
|
||||
'developer': '开发人员',
|
||||
'guest': '访客',
|
||||
|
||||
@ -47,8 +47,8 @@
|
||||
<th width="15%">// 'repositories' | tr //</th>
|
||||
<th width="15%" ng-if="!vm.isPublic">// 'role' | tr //</th>
|
||||
<th width="20%">// 'creation_time' | tr //</th>
|
||||
<th width="15%">// 'publicity' | tr //</th>
|
||||
<th width="10%">// 'operation' | tr //</th>
|
||||
<th width="15%" ng-if="!vm.isPublic">// 'publicity' | tr //</th>
|
||||
<th width="10%" ng-if="!vm.isPublic">// 'operation' | tr //</th>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
@ -63,8 +63,8 @@
|
||||
<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>
|
||||
<td width="15%"><publicity-button is-public="p.public" project-id="p.project_id" role-id="//p.current_user_role_id//"></publicity-button></td>
|
||||
<td width="10%">
|
||||
<td width="15%" ng-if="!vm.isPublic"><publicity-button is-public="p.public" project-id="p.project_id" role-id="//p.current_user_role_id//"></publicity-button></td>
|
||||
<td width="10%" ng-if="!vm.isPublic">
|
||||
<a ng-if="p.current_user_role_id == 1" href="javascript:void(0)" ng-click="vm.confirmToDelete(p.project_id, p.name)"><span class="glyphicon glyphicon-trash"></span></a>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user