Merge remote-tracking branch 'origin/data_migrations' into data_migrations
This commit is contained in:
		
						commit
						1254135ef1
					
				
					 1 changed files with 4 additions and 7 deletions
				
			
		|  | @ -19,18 +19,15 @@ | ||||||
| 			{% if clanek.cislo.pdf %} | 			{% if clanek.cislo.pdf %} | ||||||
| 			<a href="{{ clanek.cislo.pdf.url }}"> | 			<a href="{{ clanek.cislo.pdf.url }}"> | ||||||
| 				{{ clanek.nazev }} | 				{{ clanek.nazev }} | ||||||
| 				({% for r in clanek.reseni_set.first.resitele.all %} | 				({% for r in clanek.reseni_set.first.resitele.all %}{{r}}{% if not forloop.last %}, {% endif %}{% endfor %}) | ||||||
| 					{{r}} |  | ||||||
| 					{% if not forloop.last %},{% endif %} |  | ||||||
| 				{% endfor %} |  | ||||||
| 			</a> | 			</a> | ||||||
| 			) | 			 | ||||||
| 			{% else %} | 			{% else %} | ||||||
| 				{{ clanek.nazev }}  | 				{{ clanek.nazev }}  | ||||||
| 				({% for r in clanek.reseni_set.first.resitele.all %} | 				{% for r in clanek.reseni_set.first.resitele.all %} | ||||||
| 					{{r}}, | 					{{r}}, | ||||||
| 				{% endfor %} | 				{% endfor %} | ||||||
| 				vyšlo v čísle {{clanek.cislo}}) | 				(vyšlo v čísle {{clanek.cislo}}) | ||||||
| 			{% endif %} | 			{% endif %} | ||||||
| 		</li> | 		</li> | ||||||
| 	{% endwith %} | 	{% endwith %} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Jonas Havelka
						Jonas Havelka