X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c99ae5508d64ef5063d7365cc90b5295b5686db8..a5999e7b582435f9a77b5847f1590ebb8d7ccb36:/apps/explorer/models.py?ds=sidebyside diff --git a/apps/explorer/models.py b/apps/explorer/models.py index e47c26fe..ace513d4 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -5,8 +5,9 @@ from django.contrib.auth.models import User from django.conf import settings from django.utils.translation import gettext_lazy as _ -from explorer import fields +import toolbar.models +from explorer import fields class EditorSettings(models.Model): user = models.ForeignKey(User, unique=True) @@ -18,12 +19,23 @@ class EditorSettings(models.Model): def __unicode__(self): 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 @@ -48,9 +60,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