Skip to content
Snippets Groups Projects
Commit 3d2301b9 authored by OndraRehounek's avatar OndraRehounek Committed by jan.bednarik
Browse files

Redmine: Fix issue links

parent af23f95c
Branches
No related tags found
2 merge requests!473Release,!469ArticleMixin: YouTubeVideoBlock
Pipeline #7734 passed
Stage: build
Show whitespace changes
Inline Side-by-side
district/migrations/0056_alter_districtprogrampage_content.py 0 → 100644
+ 159
− 0
View file @ 3d2301b9
# Generated by Django 4.0.3 on 2022-04-21 09:25
import wagtail.core.blocks
import wagtail.core.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("district", "0055_alter_districtarticlepage_content_and_more"),
]
operations = [
migrations.AlterField(
model_name="districtprogrampage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"static_program_block",
wagtail.core.blocks.StructBlock(
[
(
"headline",
wagtail.core.blocks.CharBlock(
label="Titulek bloku", required=True
),
),
(
"perex",
wagtail.core.blocks.TextBlock(
label="Krátký text pod nadpisem", required=True
),
),
(
"person",
wagtail.core.blocks.PageChooserBlock(
label="Garant",
page_type=["district.DistrictPersonPage"],
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení", required=True
),
),
(
"program_items",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Název", required=True
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení",
required=True,
),
),
(
"issue_link",
wagtail.core.blocks.URLBlock(
label="Odkaz na Redmine issue",
required=False,
),
),
]
),
label="Seznam bodů",
),
),
]
),
),
(
"redmine_program_block",
wagtail.core.blocks.StructBlock(
[
(
"headline",
wagtail.core.blocks.CharBlock(
label="Titulek bloku", required=True
),
),
(
"perex",
wagtail.core.blocks.TextBlock(
label="Krátký text pod nadpisem", required=True
),
),
(
"person",
wagtail.core.blocks.PageChooserBlock(
label="Garant",
page_type=["district.DistrictPersonPage"],
),
),
(
"redmine_issue",
wagtail.core.blocks.IntegerBlock(
label="Číslo Redmine issue", required=True
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
help_text="Hodnota se automaticky načte s Redmine",
label="Procento dokončení - bude doplněno automaticky",
required=False,
),
),
(
"program_items",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Název", required=True
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení",
required=True,
),
),
(
"issue_link",
wagtail.core.blocks.URLBlock(
label="Odkaz na Redmine issue",
required=False,
),
),
]
),
help_text="Hodnota se automaticky načte s Redmine",
label="Seznam bodů - bude doplněno automaticky",
required=False,
),
),
]
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
]
district/templates/district/blocks/program_block.html
+ 20
− 7
View file @ 3d2301b9
...@@ -18,10 +18,17 @@ ...@@ -18,10 +18,17 @@
<div class="content-block"> <div class="content-block">
<div class="space-y-4 mt-8"> <div class="space-y-4 mt-8">
<div> <div>
<a href="https://redmine.pirati.cz/issues/28177" class="contact-line icon-link content-block--nostyle"> {% if self.redmine_issue %}
<a href="https://redmine.pirati.cz/issues/{{ self.redmine_issue }}" class="contact-line icon-link content-block--nostyle">
<i class="ico--info"></i> <i class="ico--info"></i>
<span>Plnění programu: {{ self.completion_percentage | default_if_none:'' }}%</span> <span>Plnění programu: {{ self.completion_percentage | default_if_none:'' }}%</span>
</a> </a>
{% else %}
<span class="contact-line content-block--nostyle">
<i class="ico--info"></i>
<span>Plnění programu: {{ self.completion_percentage | default_if_none:'' }}%</span>
</span>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
...@@ -42,9 +49,15 @@ ...@@ -42,9 +49,15 @@
{% for item in self.program_items %} {% for item in self.program_items %}
<tr> <tr>
<td> <td>
{% if item.issue_link %}
<a href="{{ item.issue_link }}" target="_blank"> <a href="{{ item.issue_link }}" target="_blank">
{{ item.title | default_if_none:'' }} {{ item.title | default_if_none:'' }}
</a> </a>
{% else %}
<span>
{{ item.title | default_if_none:'' }}
</span>
{% endif %}
</td> </td>
<td>{{ item.completion_percentage | default_if_none:'' }} %</td> <td>{{ item.completion_percentage | default_if_none:'' }} %</td>
</tr> </tr>
......
redmine_utils/functions.py
+ 3
− 0
View file @ 3d2301b9
...@@ -40,6 +40,9 @@ def fill_program_items_from_redmine(program_block_value: dict, issue_id: int): ...@@ -40,6 +40,9 @@ def fill_program_items_from_redmine(program_block_value: dict, issue_id: int):
{ {
"completion_percentage": issue.get("done_ratio", None), "completion_percentage": issue.get("done_ratio", None),
"title": issue.get("subject", ""), "title": issue.get("subject", ""),
"issue_link": "https://redmine.pirati.cz/issues/{}".format(
issue.get("id", "")
),
} }
) )
program_block_value["program_items"].append(sv) program_block_value["program_items"].append(sv)
region/migrations/0031_alter_regionprogrampage_content.py 0 → 100644
+ 159
− 0
View file @ 3d2301b9
# Generated by Django 4.0.3 on 2022-04-21 09:25
import wagtail.core.blocks
import wagtail.core.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("region", "0030_alter_regionarticlepage_content_and_more"),
]
operations = [
migrations.AlterField(
model_name="regionprogrampage",
name="content",
field=wagtail.core.fields.StreamField(
[
(
"static_program_block",
wagtail.core.blocks.StructBlock(
[
(
"headline",
wagtail.core.blocks.CharBlock(
label="Titulek bloku", required=True
),
),
(
"perex",
wagtail.core.blocks.TextBlock(
label="Krátký text pod nadpisem", required=True
),
),
(
"person",
wagtail.core.blocks.PageChooserBlock(
label="Garant",
page_type=["region.RegionPersonPage"],
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení", required=True
),
),
(
"program_items",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Název", required=True
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení",
required=True,
),
),
(
"issue_link",
wagtail.core.blocks.URLBlock(
label="Odkaz na Redmine issue",
required=False,
),
),
]
),
label="Seznam bodů",
),
),
]
),
),
(
"redmine_program_block",
wagtail.core.blocks.StructBlock(
[
(
"headline",
wagtail.core.blocks.CharBlock(
label="Titulek bloku", required=True
),
),
(
"perex",
wagtail.core.blocks.TextBlock(
label="Krátký text pod nadpisem", required=True
),
),
(
"person",
wagtail.core.blocks.PageChooserBlock(
label="Garant",
page_type=["region.RegionPersonPage"],
),
),
(
"redmine_issue",
wagtail.core.blocks.IntegerBlock(
label="Číslo Redmine issue", required=True
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
help_text="Hodnota se automaticky načte s Redmine",
label="Procento dokončení - bude doplněno automaticky",
required=False,
),
),
(
"program_items",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Název", required=True
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení",
required=True,
),
),
(
"issue_link",
wagtail.core.blocks.URLBlock(
label="Odkaz na Redmine issue",
required=False,
),
),
]
),
help_text="Hodnota se automaticky načte s Redmine",
label="Seznam bodů - bude doplněno automaticky",
required=False,
),
),
]
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
]
shared/blocks.py
+ 1
− 0
View file @ 3d2301b9
...@@ -63,6 +63,7 @@ class ProgramItemBlock(blocks.StructBlock): ...@@ -63,6 +63,7 @@ class ProgramItemBlock(blocks.StructBlock):
completion_percentage = blocks.IntegerBlock( completion_percentage = blocks.IntegerBlock(
label="Procento dokončení", required=True label="Procento dokončení", required=True
) )
issue_link = blocks.URLBlock(label="Odkaz na Redmine issue", required=False)
class YouTubeVideoBlock(blocks.StructBlock): class YouTubeVideoBlock(blocks.StructBlock):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft