X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/51d914bc0007135058a61623a2d057d2a7626a28..ab8425976b9ee467efdbae6b1bcdb3e9e27b9525:/apps/explorer/models.py?ds=inline diff --git a/apps/explorer/models.py b/apps/explorer/models.py index 5181e167..e104cda6 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -54,49 +54,18 @@ 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): - name = models.CharField(max_length=100) - + name = models.CharField(max_length=100, blank=True) + + # document associated with the gallery + document = models.CharField(max_length=255, unique=True) + # directory containing scans under MEDIA_ROOT/ subpath = models.CharField(max_length=255) - # document associated with the gallery - document = models.CharField(max_length=255) + def __unicode__(self): + return u"%s:%s" % (self.subpath, self.document) +