mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3

Browse source
This commit is contained in:
Tomas "Jethro" Pokorny 2019-04-30 21:24:35 +02:00
commit 6b41719e60
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
seminar/admin.py
View file

@ -101,8 +101,8 @@ class CisloInline(admin.TabularInline):
class PrilohaReseniInline(admin.StackedInline): class PrilohaReseniInline(admin.StackedInline):
model = PrilohaReseni model = PrilohaReseni
fields = ['timestamp', 'soubor', 'poznamka'] fields = ['vytvoreno', 'soubor', 'poznamka']
readonly_fields = ['timestamp'] readonly_fields = ['vytvoreno']
formfield_overrides = { formfield_overrides = {
models.TextField: {'widget': forms.TextInput}, models.TextField: {'widget': forms.TextInput},
} }
@ -381,8 +381,7 @@ class PohadkaAdmin(VersionAdmin):
'get_rocnik', 'get_rocnik',
'get_kod_ulohy', 'get_kod_ulohy',
'uloha', 'uloha',
'autor', 'autor'
'timestamp'
] ]
get_form = get_form_predvypln_autora get_form = get_form_predvypln_autora

9
seminar/models.py
View file

@ -561,7 +561,9 @@ class Soustredeni(SeminarModelBase):
class Problem(SeminarModelBase): class Problem(SeminarModelBase):
class Meta: class Meta:
abstract = True # Není abstraktní, protože se na něj jinak nedají dělat ForeignKeys.
# TODO: Udělat to polymorfní (pomocí django-polymorphic), abychom dostali po těch vazbách přímo tu úlohu/témátko vč. fieldů, které nejsou součástí modelu Problem?
#abstract = True
verbose_name = 'Problém' verbose_name = 'Problém'
verbose_name_plural = 'Problémy' verbose_name_plural = 'Problémy'
ordering = ['nazev'] ordering = ['nazev']
@ -738,7 +740,8 @@ class Reseni(SeminarModelBase):
db_table = 'seminar_reseni' db_table = 'seminar_reseni'
verbose_name = 'Řešení' verbose_name = 'Řešení'
verbose_name_plural = 'Řešení' verbose_name_plural = 'Řešení'
ordering = ['-problem_id', 'resitel'] #ordering = ['-problem', 'resitele'] # FIXME: Takhle to chceme, ale nefunguje to.
ordering = ['-cas_doruceni']
# Interní ID # Interní ID
id = models.AutoField(primary_key = True) id = models.AutoField(primary_key = True)
@ -850,7 +853,7 @@ class PrilohaReseni(SeminarModelBase):
db_table = 'seminar_priloha_reseni' db_table = 'seminar_priloha_reseni'
verbose_name = 'Příloha řešení' verbose_name = 'Příloha řešení'
verbose_name_plural = 'Přílohy řešení' verbose_name_plural = 'Přílohy řešení'
ordering = ['reseni', 'timestamp'] ordering = ['reseni', 'vytvoreno']
# Interní ID # Interní ID
id = models.AutoField(primary_key = True) id = models.AutoField(primary_key = True)