diff --git a/elections2021/management/commands/export_program.py b/elections2021/management/commands/export_program.py index 8f5047962aa77f684fa6554318f3136147b03a00..5a2990802a6f81552a5e95055f68d44fa7ca8224 100644 --- a/elections2021/management/commands/export_program.py +++ b/elections2021/management/commands/export_program.py @@ -88,17 +88,21 @@ def fancy_export(output_file): tmp_file = f"{output_file}.tmp" benefits_titles = dict(BENEFITS_CHOICES) - points = [] + pages = ( + Elections2021ProgramPointPage.objects.live() + .specific() + .order_by("-default_order") + ) - for ministry, title in MINISTRY_CHOICES: - for page in get_ministry_points(ministry): - value = render_to_string( - "elections2021/export_program_point_fancy.html", - {"page": page, "benefits_titles": benefits_titles}, - ) - value = re.sub(r'href="#', f'href="#{page.id}_', value) - value = re.sub(r'id="', f'id="{page.id}_', value) - points.append(value) + points = [] + for page in pages: + value = render_to_string( + "elections2021/export_program_point_fancy.html", + {"page": page, "benefits_titles": benefits_titles}, + ) + value = re.sub(r'href="#', f'href="#{page.id}_', value) + value = re.sub(r'id="', f'id="{page.id}_', value) + points.append(value) content = render_to_string( "elections2021/export_program_fancy.html", {"points": points}