X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/07b09d489ecbc789a096e53d98070c286c286101..3193141f55df20910cf8ba35f9e669d79c90d3f4:/apps/explorer/models.py?ds=sidebyside diff --git a/apps/explorer/models.py b/apps/explorer/models.py index f2dc8f4a..73e9063a 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -20,7 +20,8 @@ class EditorSettings(models.Model): Przykład: { 'panels': [ - {'name': 'htmleditor', 'ratio': 0.5}, + {'name': 'htmleditor', + 'ratio': 0.5}, {'name': 'gallery', 'ratio': 0.5} ], 'recentFiles': [ @@ -53,48 +54,17 @@ 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) - - # 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) +# Yes, this is intentionally unnormalized ! +class GalleryForDocument(models.Model): + name = models.CharField(max_length=100) -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('.')) + # directory containing scans under MEDIA_ROOT/ + subpath = models.CharField(max_length=255) + # document associated with the gallery + document = models.CharField(max_length=255) -def get_images_from_folder(folder): - return sorted(settings.MEDIA_URL + settings.IMAGE_DIR + u'/' + folder + u'/' + fn.decode('utf-8') for fn - in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder)) - if not fn.decode('utf-8').startswith('.')) - + def __unicode__(self): + return u"%s:%s" % (self.subpath, self.document) \ No newline at end of file