Merge branch 'develop' into test
This commit is contained in:
		
						commit
						9f30746e35
					
				
					 1 changed files with 3 additions and 3 deletions
				
			
		|  | @ -319,14 +319,14 @@ def dataResiteluCsvResponse(queryset, columns=None, with_header=True): | |||
| 		'osoba__prezdivka', | ||||
| 		'osoba__email', | ||||
| 		'osoba__telefon', | ||||
| 		'osoba__user', | ||||
| 		'osoba__user__username', | ||||
| 		'osoba__datum_narozeni', | ||||
| 		'osoba__pohlavi_muz', | ||||
| 		'osoba__ulice', | ||||
| 		'osoba__mesto', | ||||
| 		'osoba__psc', | ||||
| 		'osoba__stat', | ||||
| 		'skola',	# Bude fungovat takhle? | ||||
| 		'skola',	#FIXME: dává jen ID | ||||
| 		'poznamka', | ||||
| 		'osoba__poznamka', | ||||
| 		'rok_maturity', | ||||
|  | @ -345,7 +345,7 @@ def dataResiteluCsvResponse(queryset, columns=None, with_header=True): | |||
| 		'osoba__prezdivka':              'prezdivka', | ||||
| 		'osoba__email':                  'email', | ||||
| 		'osoba__telefon':                'telefon', | ||||
| 		'osoba__user':                   'user', | ||||
| 		'osoba__user__username':         'user', | ||||
| 		'osoba__datum_narozeni':         'datum_narozeni', | ||||
| 		'osoba__pohlavi_muz':            'pohlavi_muz', | ||||
| 		'osoba__ulice':                  'ulice', | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Pavel "LEdoian" Turinsky
						Pavel "LEdoian" Turinsky