X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/07b09d489ecbc789a096e53d98070c286c286101..927a991b71d9876995dd2beadee8d9ff16175a50:/apps/explorer/models.py diff --git a/apps/explorer/models.py b/apps/explorer/models.py index f2dc8f4a..5181e167 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': [ @@ -62,9 +63,7 @@ class Book(models.Model): abstract=True pass - -class PullRequest(models.Model): - +class PullRequest(models.Model): REQUEST_STATUSES = ( ("N", "Pending for resolution"), ("R", "Rejected"), @@ -78,7 +77,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,14 +86,17 @@ 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) - -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('.')) + merged_rev = models.CharField(max_length=40, blank=True, null=True) + def __unicode__(self): + return unicode(self.comitter) + u':' + self.document -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('.')) +# Yes, this is intentionally unnormalized ! +class GalleryForDocument(models.Model): + name = models.CharField(max_length=100) + + # directory containing scans under MEDIA_ROOT/ + subpath = models.CharField(max_length=255) + # document associated with the gallery + document = models.CharField(max_length=255)