Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
This commit is contained in:
		
						commit
						86193f1fb9
					
				
					 1 changed files with 16 additions and 7 deletions
				
			
		|  | @ -76,11 +76,20 @@ def create_modeladmin(modeladmin, model, name = None, verbose_name = None, verbo | |||
| 
 | ||||
| class ResitelInline(admin.TabularInline): | ||||
|     model = Resitel | ||||
|     fields = ['jmeno', 'prijmeni', 'skola', 'mesto', 'rok_maturity', ] | ||||
|     readonly_fields = ['jmeno', 'prijmeni', 'skola', 'mesto', 'rok_maturity', ] | ||||
|     fields = ['osoba_jmeno', 'osoba_prijmeni', 'skola', 'osoba_mesto', 'rok_maturity', ] | ||||
|     readonly_fields = ['osoba_jmeno', 'osoba_prijmeni', 'skola', 'osoba_mesto', 'rok_maturity', ] | ||||
|     extra = 0 | ||||
|     view_on_site = False | ||||
| 
 | ||||
|     def osoba_jmeno(self, obj): | ||||
|         return obj.osoba.jmeno | ||||
| 
 | ||||
|     def osoba_prijmeni(self, obj): | ||||
|         return obj.osoba.prijmeni | ||||
| 
 | ||||
|     def osoba_mesto(self, obj): | ||||
|         return obj.osoba.mesto | ||||
| 
 | ||||
|     def has_add_permission(self, req): return False | ||||
| 
 | ||||
| 
 | ||||
|  | @ -347,14 +356,14 @@ admin.site.register(Rocnik, RocnikAdmin) | |||
| class ReseniAdmin(VersionAdmin): | ||||
|     #form = autocomplete_light.modelform_factory(Reseni, autocomplete_fields=['problem', 'resitele'], fields=['problem', 'resitele']) | ||||
|     fieldsets = [ | ||||
|         (None,              {'fields': ['problem', 'resitele', 'forma', 'body', 'cislo_body', 'timestamp']}), | ||||
|         (None,              {'fields': ['problem__set', 'resitele__set', 'forma', 'cas_doruceni']}), | ||||
|         (u'Poznámky',       {'fields': ['poznamka']}), | ||||
|         ] | ||||
|     readonly_fields = ['timestamp'] | ||||
|     list_display = ['problem', 'resitele', 'forma', 'body', 'timestamp', 'cislo_body'] | ||||
|     list_filter = ['body', 'timestamp', 'forma'] | ||||
|     readonly_fields = ['cas_doruceni'] | ||||
|     list_display = [ProblemInline, ResitelInline, 'forma', 'cas_doruceni'] | ||||
|     list_filter = ['cas_doruceni', 'forma'] | ||||
|     search_fields = [] | ||||
|     inlines = [PrilohaReseniInline] | ||||
|     inlines = [PrilohaReseniInline,ProblemInline,ResitelInline] | ||||
|     view_on_site = False | ||||
| 
 | ||||
|     def get_queryset(self, request): | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Anet
						Anet