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

CL fixes

Browse source
This commit is contained in:
Joseph Schorr 2013-11-27 16:56:07 -05:00
parent cca5daf097
commit 6c1d2afc0f
5 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/model.py
View file

@ -1057,14 +1057,14 @@ def delete_webhook(namespace_name, repository_name, public_id):
webhook.delete_instance()
def list_logs(user_or_organization_name):
account = User.get(User.username == user_or_organization_name)
week_ago = datetime.today() - timedelta(7) # One week
return LogEntry.select().where(LogEntry.account == account, LogEntry.datetime >= week_ago).order_by(LogEntry.datetime.desc())
joined = LogEntry.select().join(User)
return joined.where(User.username == user_or_organization_name, LogEntry.datetime >= week_ago).order_by(LogEntry.datetime.desc())
def log_action(kind_name, user_or_organization_name, performer=None, repository=None,
access_token=None, ip=None, description=None, metadata={}):
kind = LogEntryKind.get(LogEntryKind.name == kind_name)
account = User.get(User.username == user_or_organization_name)
entry = LogEntry.create(kind = kind, account = account, performer = performer,
repository = repository, access_token = access_token, ip = ip,
description = description, metadata_json = json.dumps(metadata))
entry = LogEntry.create(kind=kind, account=account, performer=performer,
repository=repository, access_token=access_token, ip=ip,
description=description, metadata_json=json.dumps(metadata))