Compare commits

...

5 commits

Author SHA1 Message Date
476f8263d4 Merge pull request 'Otevírání článků na správné straně' (!54) from clanek-strana into master
Reviewed-on: #54
2024-06-20 14:42:39 +02:00
1ce9cb445f Tady bylo „.cislo“ navíc… 2024-06-20 14:38:27 +02:00
6225630f9f Migrační kekel 2024-06-20 14:31:58 +02:00
0bebee5329 Merge branch 'master' into clanek-strana 2024-06-19 20:34:56 +02:00
Riki
3c3b9f755a Add strana column to Clanek
Optionally add page fragment to `resitelske_clanky.html`
2024-06-15 23:35:46 +02:00
3 changed files with 21 additions and 1 deletions

View file

@ -0,0 +1,18 @@
# 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'),
),
]

View file

@ -600,6 +600,8 @@ 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):

View file

@ -17,7 +17,7 @@
{% endifchanged %} {% endifchanged %}
<li> <li>
{% if clanek.cislo.pdf %} {% if clanek.cislo.pdf %}
<a href="{{ clanek.cislo.pdf.url }}"> <a href="{{clanek.cislo.pdf.url}}{% if clanek.strana %}#page={{ clanek.strana }}{% endif %}">
{{ 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>