X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7efaf492711897d4bfc87afce9290f5d9e55ce90..653c75b6951e028fe4c68e27cc9852e45fa418a6:/apps/explorer/models.py?ds=inline diff --git a/apps/explorer/models.py b/apps/explorer/models.py index 9a5e0ffa..5fc31e7e 100644 --- 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 _ -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: - 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 Book(models.Model): class Meta: @@ -24,6 +26,7 @@ class Book(models.Model): ) 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 @@ -49,5 +52,3 @@ def get_images_from_folder(folder): in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder)) if not fn.startswith('.')) -def user_branch(user): - return 'personal_'+user.username