From 3a95da6cd22ba4a6a40ae079c6feebf423bb1e9e Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 17 Jun 2019 09:58:48 +0200 Subject: [PATCH] artifacts: show attached artifacts in advanced page, and delete them on repo deletion --- rhodecode/model/db.py | 5 +++-- rhodecode/templates/admin/repos/repo_edit_advanced.mako | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index 66378574..335d099b 100644 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -1678,11 +1678,12 @@ class Repository(Base, BaseModel): cascade="all, delete, delete-orphan") ui = relationship('RepoRhodeCodeUi', cascade="all") settings = relationship('RepoRhodeCodeSetting', cascade="all") - integrations = relationship('Integration', - cascade="all, delete, delete-orphan") + integrations = relationship('Integration', cascade="all, delete, delete-orphan") scoped_tokens = relationship('UserApiKeys', cascade="all") + artifacts = relationship('FileStore', cascade="all") + def __unicode__(self): return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id, safe_unicode(self.repo_name)) diff --git a/rhodecode/templates/admin/repos/repo_edit_advanced.mako b/rhodecode/templates/admin/repos/repo_edit_advanced.mako index f2555a72..ae728168 100644 --- a/rhodecode/templates/admin/repos/repo_edit_advanced.mako +++ b/rhodecode/templates/admin/repos/repo_edit_advanced.mako @@ -11,6 +11,7 @@ (_('Attached scoped tokens'), len(c.rhodecode_db_repo.scoped_tokens), '', [x.user for x in c.rhodecode_db_repo.scoped_tokens]), (_('Pull requests source'), len(c.rhodecode_db_repo.pull_requests_source), '', ['pr_id:{}, repo:{}'.format(x.pull_request_id,x.source_repo.repo_name) for x in c.rhodecode_db_repo.pull_requests_source]), (_('Pull requests target'), len(c.rhodecode_db_repo.pull_requests_target), '', ['pr_id:{}, repo:{}'.format(x.pull_request_id,x.target_repo.repo_name) for x in c.rhodecode_db_repo.pull_requests_target]), + (_('Attached Artifacts'), len(c.rhodecode_db_repo.artifacts), '', ''), ] %>