X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3546a2b2d5f52224bcf95803030611ab505f29cd..73bfaa4bdc8e38ee0a3f52ce5f8d6d6dd2a99a39:/apps/explorer/models.py diff --git a/apps/explorer/models.py b/apps/explorer/models.py index a8a8c3b2..73e9063a 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -54,42 +54,7 @@ class EditorPanel(models.Model): def __unicode__(self): return self.display_name - -class Book(models.Model): - class Meta: - permissions = ( - ("can_share", "Can share documents without pull requests."), - ) - abstract=True - pass - -class PullRequest(models.Model): - REQUEST_STATUSES = ( - ("N", "Pending for resolution"), - ("R", "Rejected"), - ("A", "Accepted & merged"), - ) - - comitter = models.ForeignKey(User) # the user who request the pull - comment = models.TextField() # addtional comments to the request - - # document to merge - document = models.CharField(max_length=255) - - # revision to be merged into the main branch - source_revision = models.CharField(max_length=40, unique=True) - - # current status - status = models.CharField(max_length=1, choices=REQUEST_STATUSES) - - # comment to the status change of request (if applicable) - 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) - - def __unicode__(self): - return unicode(self.comitter) + u':' + self.document + # Yes, this is intentionally unnormalized ! class GalleryForDocument(models.Model): @@ -102,4 +67,4 @@ class GalleryForDocument(models.Model): document = models.CharField(max_length=255) def __unicode__(self): - return u"%s:%s" % self.subpath, self.document \ No newline at end of file + return u"%s:%s" % (self.subpath, self.document) \ No newline at end of file