Compare commits
No commits in common. "476f8263d4b212524f7671594da8663701004b16" and "40ca76d41418284c32778ab789b2cbe7fb7f2473" have entirely different histories.
476f8263d4
...
40ca76d414
3 changed files with 1 additions and 21 deletions
|
@ -1,18 +0,0 @@
|
||||||
# Generated by Django 4.2.13 on 2024-06-15 21:24
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('seminar', '0129_novinky_post'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='clanek',
|
|
||||||
name='strana',
|
|
||||||
field=models.PositiveIntegerField(blank=True, null=True, verbose_name='první strana'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -601,8 +601,6 @@ class Clanek(Problem):
|
||||||
cislo = models.ForeignKey(Cislo, blank=True, null=True, on_delete=models.PROTECT,
|
cislo = models.ForeignKey(Cislo, blank=True, null=True, on_delete=models.PROTECT,
|
||||||
verbose_name='číslo vydání', related_name='vydane_clanky')
|
verbose_name='číslo vydání', related_name='vydane_clanky')
|
||||||
|
|
||||||
strana = models.PositiveIntegerField(verbose_name="první strana", blank=True, null=True)
|
|
||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
def kod_v_rocniku(self):
|
def kod_v_rocniku(self):
|
||||||
if self.stav == Problem.STAV_ZADANY or self.stav == Problem.STAV_VYRESENY:
|
if self.stav == Problem.STAV_ZADANY or self.stav == Problem.STAV_VYRESENY:
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
{% endifchanged %}
|
{% endifchanged %}
|
||||||
<li>
|
<li>
|
||||||
{% if clanek.cislo.pdf %}
|
{% if clanek.cislo.pdf %}
|
||||||
<a href="{{clanek.cislo.pdf.url}}{% if clanek.strana %}#page={{ clanek.strana }}{% endif %}">
|
<a href="{{ clanek.cislo.pdf.url }}">
|
||||||
{{ clanek.nazev }}
|
{{ clanek.nazev }}
|
||||||
({% for r in clanek.reseni_set.first.resitele.all %}{{r}}{% if not forloop.last %}, {% endif %}{% endfor %})
|
({% for r in clanek.reseni_set.first.resitele.all %}{{r}}{% if not forloop.last %}, {% endif %}{% endfor %})
|
||||||
</a>
|
</a>
|
||||||
|
|
Loading…
Reference in a new issue