X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/889882b4d84fb826afc834040b203dff2fb4a224..c6fc086238de9fefb56169edc148bbcd3ff866fa:/apps/explorer/models.py diff --git a/apps/explorer/models.py b/apps/explorer/models.py index a1cb56cf..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,38 +54,17 @@ class EditorPanel(models.Model): def __unicode__(self): return self.display_name - -class Book(models.Model): - class Meta: - permissions = ( - ("can_add_files", "Can do hg add."), - ) - abstract=True - pass - - -class PullRequest(models.Model): - comitter = models.ForeignKey(User) # the user who request the pull - file = models.CharField(max_length=256) # the file to request - source_rev = models.CharField(max_length=40) # revision number of the commiter - - comment = models.TextField() # addtional comments to the request + - # revision number in which the changes were merged (if any) - merged_rev = models.CharField(max_length=40, null=True) +# Yes, this is intentionally unnormalized ! +class GalleryForDocument(models.Model): + name = models.CharField(max_length=100) - def __unicode__(self): - return u"Pull request from %s, source: %s %s, status: %s." % \ - (self.commiter, self.file, self.source_rev, \ - (("merged into "+self.merged_rev) if self.merged_rev else "pending") ) - - -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