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

Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Browse source 
Conflicts:
	initdb.py
This commit is contained in:
yackob03 2014-01-09 11:33:28 -05:00
commit 393343bda4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
initdb.py
View file

@ -286,6 +286,9 @@ def populate_database():
model.log_action('delete_tag', org.username, performer=new_user_2, repository=org_repo, timestamp=today,
metadata={'username': new_user_2.username, 'repo': 'orgrepo', 'tag': 'sometag'})
model.log_action('pull_repo', org.username, repository=org_repo, timestamp=today,
metadata={'token_code': 'somecode', 'repo': 'orgrepo'})
if __name__ == '__main__':
logging.basicConfig(**app.config['LOGGING_CONFIG'])
initialize_database()

7
static/js/app.js
View file

@ -1287,9 +1287,7 @@ quayApp.directive('logsView', function () {
'robot': 'wrench'
};
if (log.ip) {
log.metadata['_ip'] = log.ip;
}
log.metadata['_ip'] = log.ip ? log.ip : null;
var description = logDescriptions[log.kind] || logTitles[log.kind] || log.kind;
if (typeof description != 'string') {
@ -1298,7 +1296,8 @@ quayApp.directive('logsView', function () {
for (var key in log.metadata) {
if (log.metadata.hasOwnProperty(key)) {
var markedDown = getMarkedDown(log.metadata[key].toString());
var value = log.metadata[key] != null ? log.metadata[key].toString() : '(Unknown)';
var markedDown = getMarkedDown(value);
markedDown = markedDown.substr('<p>'.length, markedDown.length - '<p></p>'.length);
var icon = fieldIcons[key];