From 660f7d826c1237f2ddde9225b208165e08063570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Wed, 23 Sep 2015 22:27:59 +0200 Subject: [PATCH] =?UTF-8?q?Admin:=20ve=20v=C3=BDb=C4=9Bru=20u=C5=BEivatele?= =?UTF-8?q?=20zobraz=20cel=C3=A9=20jm=C3=A9no?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a jen ty, kteří se mohou přihlásit do adminu. --- seminar/admin.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/seminar/admin.py b/seminar/admin.py index 1902c74c..c0b0311b 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -8,10 +8,13 @@ from solo.admin import SingletonModelAdmin from ckeditor.widgets import CKEditorWidget from django.db.models import Count from django.db import models +from django.contrib.auth.models import User from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Novinky, Organizator import autocomplete_light +uzivatele = [(user, u"{} ({})".format(user.get_full_name(), user)) for user in User.objects.filter(is_staff=True)] + def predvypln_prihlaseneho(*pole): u"""Dekorátor pro Adminy. Předvyplní do *polí přihlášeného uživatele. @@ -288,13 +291,14 @@ admin.site.register(Reseni, ReseniAdmin) from autocomplete_light.contrib.taggit_field import TaggitField, TaggitWidget -#TODO: Autocomplete autor/opravovatel class ProblemAdminForm(forms.ModelForm): text_zadani = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Problem, 'text_zadani')) text_reseni = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Problem, 'text_reseni')) text_org = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Problem, 'text_org')) zamereni = TaggitField(widget=TaggitWidget('TagAutocomplete'), required=False) + autor = forms.ChoiceField(choices=uzivatele) + opravovatel = forms.ChoiceField(choices=uzivatele) class Meta: model = Problem exclude = [] @@ -375,6 +379,7 @@ admin.site.register(Soustredeni, SoustredeniAdmin) class NovinkyAdminForm(forms.ModelForm): text = forms.CharField(widget=CKEditorWidget(), required=False, **field_labels(Novinky, 'text')) + autor = forms.ChoiceField(choices=uzivatele) class Meta: model = Novinky exclude = []