From: Ɓukasz Rekucki Date: Thu, 27 Aug 2009 16:26:05 +0000 (+0200) Subject: Merge branch 'master' of git@stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0e6a1823931e3a2bad3b20ca479308978da7b0a8?ds=inline;hp=-c Merge branch 'master' of git@stigma:platforma --- 0e6a1823931e3a2bad3b20ca479308978da7b0a8 diff --combined apps/explorer/models.py index 2b2e8e81,7e416a38..f867189f --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@@ -1,6 -1,22 +1,22 @@@ import os + from django.db import models + 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) + + class Meta: + ordering = ['user__name'] + verbose_name, verbose_name_plural = _("panel settings"), _("panel settings") + + def __unicode__(self): + return u"Panel settings for %s" % self.user.name def get_image_folders(): @@@ -12,5 -28,3 +28,5 @@@ 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