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

Dalsi update adminu

Browse source
This commit is contained in:
Tomas Gavenciak 2015-05-14 16:57:12 +02:00
parent 013b492f40
commit f33be6c2e9
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
seminar/admin.py
View file

@ -51,8 +51,9 @@ class CisloAdmin(reversion.VersionAdmin):
(u'Data', {'fields': ['datum_vydani', 'datum_deadline']}), (u'Data', {'fields': ['datum_vydani', 'datum_deadline']}),
] ]
list_display = ['kod', 'rocnik', 'cislo', 'datum_vydani', 'datum_deadline', 'verejne'] list_display = ['kod', 'rocnik', 'cislo', 'datum_vydani', 'datum_deadline', 'verejne']
list_display_links = ['rocnik'] list_display_links = ['cislo', 'kod']
list_filter = ['rocnik'] list_filter = ['rocnik']
view_on_site = Cislo.verejne_url
admin.site.register(Cislo, CisloAdmin) admin.site.register(Cislo, CisloAdmin)
@ -69,6 +70,7 @@ class RocnikAdmin(reversion.VersionAdmin):
] ]
list_display = ['rocnik', 'prvni_rok', 'verejne'] list_display = ['rocnik', 'prvni_rok', 'verejne']
inlines = [CisloInline] inlines = [CisloInline]
view_on_site = Rocnik.verejne_url
admin.site.register(Rocnik, RocnikAdmin) admin.site.register(Rocnik, RocnikAdmin)
@ -111,6 +113,7 @@ admin.site.register(Reseni, ReseniAdmin)
class ReseniInline(admin.TabularInline): class ReseniInline(admin.TabularInline):
model = Reseni model = Reseni
readonly_fields = ['poznamka']
extra = 0 extra = 0
@ -131,11 +134,13 @@ class ProblemAdmin(reversion.VersionAdmin):
(u'Vydání', {'fields': ['cislo_zadani', 'kod', 'cislo_reseni', 'opravovatel']}), (u'Vydání', {'fields': ['cislo_zadani', 'kod', 'cislo_reseni', 'opravovatel']}),
(u'Texty', {'fields': ['text_problemu', 'text_problemu_org']}), (u'Texty', {'fields': ['text_problemu', 'text_problemu_org']}),
] ]
list_display = ['kod', 'nazev', 'typ', 'stav', 'autor', 'opravovatel', 'verejne', 'cislo_zadani'] list_display = ['nazev', 'typ', 'kod', 'stav', 'autor', 'opravovatel', 'verejne', 'cislo_zadani']
list_display_links = ['autor', 'opravovatel', 'cislo_zadani'] list_select_related = True
list_display_links = ['nazev']
list_filter = ['typ', 'stav', 'autor', 'opravovatel'] list_filter = ['typ', 'stav', 'autor', 'opravovatel']
search_fields = ['nazev', 'kod', 'text_problemu_org', 'text_problemu'] search_fields = ['nazev', 'kod', 'text_problemu_org', 'text_problemu']
inlines = [ReseniInline] inlines = [ReseniInline]
view_on_site = Problem.verejne_url
admin.site.register(Problem, ProblemAdmin) admin.site.register(Problem, ProblemAdmin)
@ -149,5 +154,6 @@ class SoustredeniAdmin(reversion.VersionAdmin):
] ]
list_display = ['rocnik', 'misto', 'datum_zacatku', 'verejne'] list_display = ['rocnik', 'misto', 'datum_zacatku', 'verejne']
list_filter = ['rocnik'] list_filter = ['rocnik']
view_on_site = Soustredeni.verejne_url
admin.site.register(Soustredeni, SoustredeniAdmin) admin.site.register(Soustredeni, SoustredeniAdmin)

4
seminar/models.py
View file

@ -199,7 +199,7 @@ class Rocnik(SeminarModelBase):
return force_unicode(self.rocnik) return force_unicode(self.rocnik)
def verejne(self): def verejne(self):
return len(self.verejne_cisla()) > 0 return len(self.verejna_cisla()) > 0
verejne.boolean = True verejne.boolean = True
def verejna_cisla(self): def verejna_cisla(self):
@ -359,7 +359,7 @@ class Reseni(SeminarModelBase):
timestamp = models.DateTimeField(u'vytvořeno', auto_now=True) timestamp = models.DateTimeField(u'vytvořeno', auto_now=True)
poznamka = models.TextField(u'neveřejná poznámka', blank=True, poznamka = models.TextField(u'neveřejná poznámka', blank=True,
help_text=u'Neveřejná poznámka k řešení (plain text)') help_text=u'Neveřejná poznámka k řešení (plain text, editace v detailu řešení)')
def __str__(self): def __str__(self):
return force_unicode(u"%s: %s (%sb)" % (self.resitel.plne_jmeno(), self.problem.nazev, self.body)) return force_unicode(u"%s: %s (%sb)" % (self.resitel.plne_jmeno(), self.problem.nazev, self.body))