vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add logs support for the new default permissions model

Browse source
This commit is contained in:
Joseph Schorr 2014-01-21 17:04:00 -05:00
parent aeeacd1d0d
commit 3864fc3e88
5 changed files with 79 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
static/js/app.js
View file

@ -1232,6 +1232,7 @@ quayApp.directive('logsView', function () {
return 'Remove permission for token {token} from repository {repo}';
}
},
'delete_tag': 'Tag {tag} deleted in repository {repo} by user {username}',
'change_repo_visibility': 'Change visibility for repository {repo} to {visibility}',
'add_repo_accesstoken': 'Create access token {token} in repository {repo}',
'delete_repo_accesstoken': 'Delete access token {token} in repository {repo}',
@ -1244,7 +1245,28 @@ quayApp.directive('logsView', function () {
'org_add_team_member': 'Add member {member} to team {team}',
'org_remove_team_member': 'Remove member {member} from team {team}',
'org_set_team_description': 'Change description of team {team}: {description}',
'org_set_team_role': 'Change permission of team {team} to {role}'
'org_set_team_role': 'Change permission of team {team} to {role}',
'create_prototype_permission': function(metadata) {
if (metadata.delegate_user) {
return 'Create default permission: {role} for {delegate_user}, when creating user is {activating_username}';
} else if (metadata.delegate_team) {
return 'Create default permission: {role} for {delegate_team}, when creating user is {activating_username}';
}
},
'modify_prototype_permission': function(metadata) {
if (metadata.delegate_user) {
return 'Modify default permission: {role} (from {original_role}) for {delegate_user}, when creating user is {activating_username}';
} else if (metadata.delegate_team) {
return 'Modify default permission: {role} (from {original_role}) for {delegate_team}, when creating user is {activating_username}';
}
},
'delete_prototype_permission': function(metadata) {
if (metadata.delegate_user) {
return 'Delete default permission: {role} for {delegate_user}, when creating user is {activating_username}';
} else if (metadata.delegate_team) {
return 'Delete default permission: {role} for {delegate_team}, when creating user is {activating_username}';
}
}
};
var logKinds = {
@ -1267,12 +1289,16 @@ quayApp.directive('logsView', function () {
'delete_repo_webhook': 'Delete webhook',
'set_repo_description': 'Change repository description',
'build_dockerfile': 'Build image from Dockerfile',
'delete_tag': 'Delete Tag',
'org_create_team': 'Create team',
'org_delete_team': 'Delete team',
'org_add_team_member': 'Add team member',
'org_remove_team_member': 'Remove team member',
'org_set_team_description': 'Change team description',
'org_set_team_role': 'Change team permission'
'org_set_team_role': 'Change team permission',
'create_prototype_permission': 'Create default permission',
'modify_prototype_permission': 'Modify default permission',
'delete_prototype_permission': 'Delete default permission'
};
var getDateString = function(date) {
@ -1350,10 +1376,16 @@ quayApp.directive('logsView', function () {
$scope.getDescription = function(log) {
var fieldIcons = {
'username': 'user',
'activating_username': 'user',
'delegate_user': 'user',
'delegate_team': 'group',
'team': 'group',
'token': 'key',
'repo': 'hdd-o',
'robot': 'wrench'
'robot': 'wrench',
'tag': 'tag',
'role': 'th-large',
'original_role': 'th-large'
};
log.metadata['_ip'] = log.ip ? log.ip : null;
@ -1377,7 +1409,7 @@ quayApp.directive('logsView', function () {
description = description.replace('{' + key + '}', '<code>' + markedDown + '</code>');
}
}
return $sce.trustAsHtml(description);
return $sce.trustAsHtml(description.replace('\n', '<br>'));
};
$scope.$watch('organization', update);