Literówka - zamiast self powinno byæ this.

[redakcja.git] / apps / explorer / models.py

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 10491f6..ace513d 100644 (file)
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -5,18 +5,38 @@ from django.contrib.auth.models import User
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 

+import toolbar.models

 
 

-class PanelSettings(models.Model):
-    user = models.ForeignKey(User)
-    left_panel = models.CharField(blank=True,  max_length=80)
-    right_panel = models.CharField(blank=True,  max_length=80)
+from explorer import fields

 
 

+class EditorSettings(models.Model):
+    user = models.ForeignKey(User, unique=True)
+    settings = fields.JSONField()
+    

     class Meta:
     class Meta:

-        ordering = ['user__name']
-        verbose_name, verbose_name_plural = _("panel settings"), _("panel settings")
+        verbose_name, verbose_name_plural = _("editor settings"), _("editor settings")

 
     def __unicode__(self):
 
     def __unicode__(self):

-        return u"Panel settings for %s" % self.user.name
+        return u"Editor settings for %s" % self.user.username
+
+class EditorPanel(models.Model):
+    id = models.CharField(max_length=24, primary_key=True)
+    display_name = models.CharField(max_length=128)
+
+    toolbar_groups = models.ManyToManyField(toolbar.models.ButtonGroup, blank=True)
+    toolbar_extra = models.ForeignKey(toolbar.models.ButtonGroup, null=True, blank=True,
+        unique=True, related_name='main_editor_panels')
+
+    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):
 
 
 class PullRequest(models.Model):


@@ -40,9 +60,7 @@ def get_image_folders():
 
 
 def get_images_from_folder(folder):
 
 
 def get_images_from_folder(folder):

-    return sorted(settings.MEDIA_URL + settings.IMAGE_DIR + '/' + folder + '/' + fn for fn 
+    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))
             in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))

-            if not fn.startswith('.'))
+            if not fn.decode('utf-8').startswith('.'))

 
 

-def user_branch(user):
-    return 'personal_'+user.username