release commit - apps/budgeting: remove blueprint for 3-phase budgeti…

…ng, remove voting token form, remove react proposal list
liqd · Dec 13, 2022 · 851f45c · 851f45c
1 parent 0624561
commit 851f45c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 46 deletions.
diff --git 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 %}
     <script type="text/javascript" src="{% static 'a4maps_display_points.js' %}"></script>
@@ -19,28 +19,6 @@
             {% translate 'Submit proposal' %}
         </a>
     {% endif %}
-    {% if module.blueprint_type == 'PB3' %}
-        {% has_perm 'meinberlin_budgeting.add_vote' request.user module as vote_allowed %}
-        {% if vote_allowed %}
-            {% if not valid_token_present %}
-                <form action="{{ request.path }}" method="post">
-                  {% csrf_token %}
-                    <div class="input-group input-group-lg">
-                        <label for="id_token" class="visually-hidden-focusable">{% translate 'Voting token form fields' %}</label>
-                        {{ token_form.token|add_error_attr:"aria-invalid:true" }}
-                        <button type="submit" class="btn btn--primary">{% translate 'Enter code' %}</button>
-                    </div>
-                    {% if token_form.token.errors %}
-                        <ul class="errorlist" aria-live="assertive" aria-atomic="true">
-                        {% for error in token_form.token.errors %}
-                            <li>{{ error|escape }}</li>
-                        {% endfor %}
-                        </ul>
-                    {% endif %}
-                </form>
-            {% endif %}
-        {% endif %}
-    {% endif %}
 {% endblock %}
 
 {% block phase_content %}
@@ -67,11 +45,8 @@
             {% endif %}
         </div>
     {% else %}
-        {% react_proposals view.module %}
-
         <div class="container u-spacer-bottom u-spacer-top-double">
             <div class="offset-lg-2 col-lg-8">
-                <div>This is the old list to compare the new list above to. And we will only deploy the old list when we do deploy.</div>
                 {% include "meinberlin_contrib/includes/map_filter_and_sort.html" with filter=view.filter mode=view.mode %}
             </div>
         </div>

diff --git a/meinberlin/apps/dashboard/blueprints.py b/meinberlin/apps/dashboard/blueprints.py
@@ -100,26 +100,6 @@
          settings_model=('a4maps', 'AreaSettings'),
          type='PB2',
      )),
-    ('participatory-budgeting-3-phases',
-     ProjectBlueprint(
-         title=_('Participatory budgeting (3 phase)'),
-         description=_(
-             'In a first phase, participants can submit their own '
-             'suggestions, mark them on a map, and add a budget. The '
-             'proposals of others can be discussed. In a second phase '
-             'proposals can be supported. In the third phase, participants '
-             'vote on the shortlisted proposals.  '
-         ),
-         content=[
-             budgeting_phases.CollectPhase(),
-             budgeting_phases.SupportPhase(),
-             budgeting_phases.VotingPhase(),
-         ],
-         # The icon has to be updated:
-         image='images/participatory-budgeting-3.svg',
-         settings_model=('a4maps', 'AreaSettings'),
-         type='PB3',
-     )),
     ('kiezkasse',
      ProjectBlueprint(
          title=_('Kiezkasse'),