X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/998977e74882d0c12413d7bc08c8475a78afbf18..653c75b6951e028fe4c68e27cc9852e45fa418a6:/apps/explorer/models.py

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 3b5848b7..5fc31e7e 100644
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -1,14 +1,54 @@
 import os
 
+from django.db import models
+from django.contrib.auth.models import User
 from django.conf import settings
+from django.utils.translation import gettext_lazy as _
 
+from explorer import fields
 
+
+class EditorSettings(models.Model):
+    user = models.ForeignKey(User, unique=True)
+    settings = fields.JSONField()
+    
+    class Meta:
+        verbose_name, verbose_name_plural = _("editor settings"), _("editor settings")
+
+    def __unicode__(self):
+        return u"Editor settings for %s" % self.user.username
+
+
+class Book(models.Model):
+    class Meta:
+        permissions = (
+            ("can_add_files", "Can do hg add."),
+        )
+    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) 
+    
+    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 [fn for fn in os.listdir(settings.IMAGE_DIR) if not fn.startswith('.')]
+    return sorted(fn for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR)) if not fn.startswith('.'))
 
 
 def get_images_from_folder(folder):
-    return ['/media/images/' + folder + '/' + fn for fn 
-            in os.listdir(os.path.join(settings.IMAGE_DIR, folder))
-            if not fn.startswith('.')]
+    return sorted(settings.MEDIA_URL + settings.IMAGE_DIR + '/' + folder + '/' + fn for fn 
+            in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))
+            if not fn.startswith('.'))