diff --git a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_moderate_form.html b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_moderate_form.html index 9fe3b180e0..ca2b67a89d 100644 --- a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_moderate_form.html +++ b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_moderate_form.html @@ -31,12 +31,6 @@

{% translate 'Moderate proposal' %}

{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.moderator_feedback %} {% include 'meinberlin_contrib/includes/form_field.html' with field=forms.statement.statement %} {% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=forms.moderateable.is_archived %} - {% if forms.moderateable.show_tasks %} - {% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.completed_tasks add_class='u-top-divider' %} - {% include 'meinberlin_contrib/includes/form_field.html' with field=forms.remark.remark %} - {% else %} - {% include 'meinberlin_contrib/includes/form_field.html' with field=forms.remark.remark add_class='u-top-divider' %} - {% endif %}
diff --git a/meinberlin/apps/budgeting/views.py b/meinberlin/apps/budgeting/views.py index 5215343ed5..e18b05f8ab 100644 --- a/meinberlin/apps/budgeting/views.py +++ b/meinberlin/apps/budgeting/views.py @@ -8,7 +8,6 @@ from adhocracy4.labels import filters as label_filters from adhocracy4.projects.mixins import DisplayProjectOrModuleMixin from meinberlin.apps.ideas import views as idea_views -from meinberlin.apps.moderatorremark.forms import ModeratorRemarkForm from meinberlin.apps.projects.views import ArchivedWidget from meinberlin.apps.votes.forms import TokenForm from meinberlin.apps.votes.models import VotingToken @@ -138,7 +137,6 @@ class ProposalModerateView(idea_views.AbstractIdeaModerateView): permission_required = 'meinberlin_budgeting.moderate_proposal' template_name = 'meinberlin_budgeting/proposal_moderate_form.html' moderateable_form_class = forms.ProposalModerateForm - remark_form_class = ModeratorRemarkForm class ProposalDashboardExportView(DashboardExportView): diff --git a/meinberlin/apps/contrib/templates/meinberlin_contrib/item_detail.html b/meinberlin/apps/contrib/templates/meinberlin_contrib/item_detail.html index 3485d572b0..f003347262 100644 --- a/meinberlin/apps/contrib/templates/meinberlin_contrib/item_detail.html +++ b/meinberlin/apps/contrib/templates/meinberlin_contrib/item_detail.html @@ -64,7 +64,7 @@

{{ object.name }}

- {% if is_moderator and not module.blueprint_type in 'PB3,PB2,PB' %} + {% if is_moderator %} {% popover_remark object %} {% endif %} @@ -125,64 +125,6 @@

{% translate 'Official Statement' %}

{% block vote_button %}{% endblock %} - {% block moderation_info %} - {% if is_moderator and module.blueprint_type in 'PB3,PB2,PB' %} -
-
-
- -

{% translate 'Moderation' %}

- -
- {% if object.module.moderationtask_set or object.remark.remark %} -
-

{% translate 'Moderation tasks' %}

- {% if object.module.moderationtask_set.count > 0 %} -
    - {% for task in object.module.moderationtask_set.all %} -
  • - {% if task in object.completed_tasks.all %} - - {% else %} - - {% endif %} - {{ task.name }} -
  • - {% endfor %} -
- {% else %} -

- {% translate 'If you want to add moderation tasks here, you can do so in the module settings.' %} -

- {% endif %} -

{% translate 'Remark' %}

- {% if object.remark.remark %} -

- {{ object.remark.remark }} -

- {% else %} -

- {% translate 'No moderation remark has been filled yet.' %} -

- {% endif %} -
- {% endif %} -
- {% get_item_url object 'moderate' False as moderate_url %} - {% if moderate_url %} - - - {% translate 'Edit' %} - - {% endif %} -
-
- {% endif %} - {% endblock %} -
{% react_comments_async object %}
diff --git a/meinberlin/apps/moderationtasks/dashboard.py b/meinberlin/apps/moderationtasks/dashboard.py index 6dddcf6237..8757fcdfe2 100644 --- a/meinberlin/apps/moderationtasks/dashboard.py +++ b/meinberlin/apps/moderationtasks/dashboard.py @@ -17,7 +17,7 @@ class ModerationTasksComponent(ModuleFormSetComponent): 'meinberlin_moderationtasks/moderation_tasks_form.html' def is_effective(self, module): - return module.blueprint_type in ['PB', 'PB2', 'PB3'] + return False components.register_module(ModerationTasksComponent())