From 048b9a7f75ad02fccc7b18d645ea41f785c7fe23 Mon Sep 17 00:00:00 2001 From: fuzzylogic2000 Date: Mon, 3 Jan 2022 16:08:24 +0100 Subject: [PATCH] release commit - apps/budgeting: remove blueprint for 3-phase budgeting, remove voting token form, remove react proposal list --- .../meinberlin_budgeting/proposal_list.html | 26 +------------------ meinberlin/apps/dashboard/blueprints.py | 18 ------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_list.html b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_list.html index 7d22756a3a..fd2109b9f5 100644 --- a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_list.html +++ b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_list.html @@ -1,5 +1,5 @@ {% extends extends %} -{% load i18n discovery_tags static maps_tags react_proposals widget_tweaks rules %} +{% load i18n discovery_tags static maps_tags widget_tweaks rules %} {% block extra_js %} @@ -19,27 +19,6 @@ {% trans 'Submit proposal' %} {% endif %} - {% comment %} - FIXME: differentiating 2 and 3 phase buergerhaushalt by just counting the phases - should be changed once we have module types - {% endcomment %} - {% if module.phases.count == 3 %} - {% has_perm 'meinberlin_budgeting.add_vote' request.user module as vote_allowed %} - {% if vote_allowed %} - {% if not valid_token_present %} -
-
- {% csrf_token %} -
- {{ token_form.token }} - -
- {{ token_form.token.errors }} -
-
- {% endif %} - {% endif %} - {% endif %} {% endblock %} {% block phase_content %} @@ -61,11 +40,8 @@ {% map_display_points object_list module.settings_instance.polygon %} {% else %} - {% react_proposals view.module %} -
-
This is the old list to compare the new list above to. And we will only deploy the old list when we do deploy.
{% include "meinberlin_contrib/includes/map_filter_and_sort.html" with filter=view.filter mode=view.mode %}
diff --git a/meinberlin/apps/dashboard/blueprints.py b/meinberlin/apps/dashboard/blueprints.py index ce4a94b187..4912eb34ac 100644 --- a/meinberlin/apps/dashboard/blueprints.py +++ b/meinberlin/apps/dashboard/blueprints.py @@ -94,24 +94,6 @@ image='images/participatory-budgeting-2.svg', settings_model=('a4maps', 'AreaSettings'), )), - ('participatory-budgeting-3-phases', - ProjectBlueprint( - title=_('Participatory budgeting (3 phase)'), - description=_( - 'In a first phase, participants can submit their own proposals, ' - 'mark them on a map, and add a budget. The proposals of others ' - 'can be discussed and in a second phase rated (pro/contra). In ' - 'the third phase, participants vote on the shortlisted proposals.' - ), - content=[ - budgeting_phases.CollectPhase(), - budgeting_phases.RatingPhase(), - budgeting_phases.VotingPhase(), - ], - # The icon has to be updated: - image='images/participatory-budgeting-3.svg', - settings_model=('a4maps', 'AreaSettings'), - )), ('kiezkasse', ProjectBlueprint( title=_('Kiezkasse'),