Sprawdzanie pustych grup.

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

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 9a5e0ff..f292283 100644 (file)
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -5,17 +5,19 @@ 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 _
 

-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 Book(models.Model):
     class Meta:
 
 class Book(models.Model):
     class Meta:


@@ -24,6 +26,7 @@ class Book(models.Model):
         )
     pass
 
         )
     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
 class PullRequest(models.Model):
     comitter = models.ForeignKey(User) # the user who request the pull 
     file = models.CharField(max_length=256) # the file to request


@@ -45,9 +48,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