X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/085dd288093e1fd5455cc4db9f82998f05656a14..1c9098d6313e24c7fd873859c7e10b81452f4bec:/apps/explorer/models.py diff --git a/apps/explorer/models.py b/apps/explorer/models.py index 0a3a252d..6d8cd8e0 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -56,8 +56,8 @@ class EditorPanel(models.Model): class Book(models.Model): class Meta: - permissions = ( - ("can_add_files", "Can do hg add."), + permissions = ( + ("can_share", "Can share documents without pull requests."), ) abstract=True pass @@ -78,7 +78,7 @@ class PullRequest(models.Model): document = models.CharField(max_length=255) # revision to be merged into the main branch - source_revision = models.CharField(max_length=40) + source_revision = models.CharField(max_length=40, unique=True) # current status status = models.CharField(max_length=1, choices=REQUEST_STATUSES) @@ -87,7 +87,11 @@ class PullRequest(models.Model): response_comment = models.TextField(blank=True) # revision number in which the changes were merged (if any) - merged_rev = models.CharField(max_length=40, blank=True, null=True) + merged_rev = models.CharField(max_length=40, blank=True, null=True) + + + def __unicode__(self): + return unicode(self.comitter) + u':' + self.document def get_image_folders(): return sorted(fn for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR)) if not fn.startswith('.'))