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

Merge branch 'lumberjack' of https://bitbucket.org/yackob03/quay into lumberjack

Browse source
This commit is contained in:
Joseph Schorr 2013-12-02 18:21:22 -05:00
commit 377d77f52b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/database.py
View file

@ -217,8 +217,9 @@ class LogEntryKind(BaseModel):
class LogEntry(BaseModel): class LogEntry(BaseModel):
kind = ForeignKeyField(LogEntryKind, index=True) kind = ForeignKeyField(LogEntryKind, index=True)
account = ForeignKeyField(User, index=True, related_name = 'account') account = ForeignKeyField(User, index=True, related_name='account')
performer = ForeignKeyField(User, index=True, null=True, related_name = 'performer') performer = ForeignKeyField(User, index=True, null=True,
related_name='performer')
repository = ForeignKeyField(Repository, index=True, null=True) repository = ForeignKeyField(Repository, index=True, null=True)
access_token = ForeignKeyField(AccessToken, null=True) access_token = ForeignKeyField(AccessToken, null=True)
datetime = DateTimeField(default=datetime.now, index=True) datetime = DateTimeField(default=datetime.now, index=True)
@ -229,4 +230,5 @@ class LogEntry(BaseModel):
all_models = [User, Repository, Image, AccessToken, Role, all_models = [User, Repository, Image, AccessToken, Role,
RepositoryPermission, Visibility, RepositoryTag, RepositoryPermission, Visibility, RepositoryTag,
EmailConfirmation, FederatedLogin, LoginService, QueueItem, EmailConfirmation, FederatedLogin, LoginService, QueueItem,
RepositoryBuild, Team, TeamMember, TeamRole, Webhook, LogEntryKind, LogEntry] RepositoryBuild, Team, TeamMember, TeamRole, Webhook,
LogEntryKind, LogEntry]

2
data/model.py
View file

@ -930,7 +930,7 @@ def set_team_repo_permission(team_name, namespace_name, repository_name,
def purge_repository(namespace_name, repository_name): def purge_repository(namespace_name, repository_name):
fetched = Repository.get(Repository.name == repository_name, fetched = Repository.get(Repository.name == repository_name,
Repository.namespace == namespace_name) Repository.namespace == namespace_name)
fetched.delete_instance(recursive=True, delete_nullable=True) fetched.delete_instance(recursive=True)
def get_private_repo_count(username): def get_private_repo_count(username):