X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7efaf492711897d4bfc87afce9290f5d9e55ce90..d3c74552a8f8509ff85cf956cf2b750d8387b683:/apps/explorer/models.py diff --git a/apps/explorer/models.py b/apps/explorer/models.py index 9a5e0ffa..a1cb56cf 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -1,3 +1,4 @@ +# -*- encoding: utf-8 -*- import os from django.db import models @@ -5,25 +6,63 @@ from django.contrib.auth.models import User 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) +import toolbar.models +from explorer import fields + +class EditorSettings(models.Model): + """Ustawienia edytora dla użytkownika. + + Pole settings zawiera obiekt JSON o kluczach: + - panels - lista otwartych paneli i ich proporcje + - recentFiles - lista otwartych plików i ustawienia dla nich + + Przykład: + { + 'panels': [ + {'name': 'htmleditor', 'ratio': 0.5}, + {'name': 'gallery', 'ratio': 0.5} + ], + 'recentFiles': [ + { + 'fileId': 'mickiewicz_pan_tadeusz.xml', + 'panels': [ + {'name': 'htmleditor', 'ratio': 0.4}, + {'name': 'gallery', 'ratio': 0.6} + ] + } + ] + } + """ + user = models.ForeignKey(User, unique=True) + settings = fields.JSONField() + 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): - 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): comitter = models.ForeignKey(User) # the user who request the pull file = models.CharField(max_length=256) # the file to request @@ -45,9 +84,7 @@ def get_image_folders(): 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)) - if not fn.startswith('.')) + if not fn.decode('utf-8').startswith('.')) -def user_branch(user): - return 'personal_'+user.username