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

…ng, remove voting token form, remove react proposal list
liqd · Mar 15, 2022 · 048b9a7 · 048b9a7
1 parent c5029ed
commit 048b9a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 43 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,27 +19,6 @@
             {% trans 'Submit proposal' %}
         </a>
     {% 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 %}
-                <form class="" action="{{ request.path }}" method="post">
-                    <div class="form-group">
-                        {% csrf_token %}
-                        <div class="widget--{{ token_form.token|widget_type }}">
-                            {{ token_form.token }}
-                            <button type="submit" class="btn">{% trans 'Enter code' %}</button>
-                        </div>
-                        {{ token_form.token.errors }}
-                    </div>
-                </form>
-            {% endif %}
-        {% endif %}
-    {% endif %}
 {% endblock %}
 
 {% block phase_content %}
@@ -61,11 +40,8 @@
             {% map_display_points object_list module.settings_instance.polygon %}
         </div>
     {% else %}
-        {% react_proposals view.module %}
-
         <div class="l-wrapper u-spacer-bottom u-spacer-top-double">
             <div class="l-center-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
@@ -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'),