diff --git a/src/backoffice/templates/backoffice/assemblyteam_editposition.html b/src/backoffice/templates/backoffice/assemblyteam_editposition_assembly.html similarity index 99% rename from src/backoffice/templates/backoffice/assemblyteam_editposition.html rename to src/backoffice/templates/backoffice/assemblyteam_editposition_assembly.html index c12dde635e12dc0808157e425b0f82410d96a6da..df5a8ab5902b48f35710cd4ef1a95d81f58c318c 100644 --- a/src/backoffice/templates/backoffice/assemblyteam_editposition.html +++ b/src/backoffice/templates/backoffice/assemblyteam_editposition_assembly.html @@ -17,7 +17,7 @@ <div class="card mb-3"> <div class="card-header">{% trans "Assembly__edit__position" %}</div> <div class="card-body"> - <form action="{% url 'backoffice:assemblyteam-editposition' pk=assembly.id %}" + <form action="{% url 'backoffice:assemblyteam-editposition-assembly' pk=assembly.id %}" method="post"> {% csrf_token %} <input type="hidden" name="value" value="{{ new_value }}"> diff --git a/src/backoffice/urls.py b/src/backoffice/urls.py index c7f1201d865df555db5c553dcea617fb07a4d6c8..21e729cad7740ac985d2286622ba01bb12c0b254 100644 --- a/src/backoffice/urls.py +++ b/src/backoffice/urls.py @@ -67,7 +67,7 @@ urlpatterns = [ path('assemblyteam/<uuid:pk>', assemblyteam.AssemblyView.as_view(), name='assemblyteam-detail'), path('assemblyteam/<uuid:pk>/state', assemblyteam.AssemblyEditStateView.as_view(), name='assemblyteam-editstate'), path('assemblyteam/<uuid:pk>/hierarchy', assemblyteam.AssemblyEditHierarchyView.as_view(), name='assemblyteam-edithierarchy'), - path('assemblyteam/<uuid:pk>/position', assemblyteam.AssemblyEditPlacementView.as_view(), name='assemblyteam-editposition'), + path('assemblyteam/<uuid:pk>/position', assemblyteam.AssemblyEditPlacementView.as_view(), name='assemblyteam-editposition-assembly'), path('assemblyteam/<uuid:pk>/message', assemblyteam.AssemblyMessageView.as_view(), name='assemblyteam-message'), path('assembly/create', assemblies.AssemblyCreateView.as_view(), name='assembly-create'), path('assembly/<uuid:pk>', assemblies.AssemblyDetailView.as_view(), name='assembly'), diff --git a/src/backoffice/views/assemblyteam.py b/src/backoffice/views/assemblyteam.py index e57fc7563cd05a3c025ed524316bf5c47efcbd60..1d46577b0ba2c62d8a0de21318b1995d2f70550f 100644 --- a/src/backoffice/views/assemblyteam.py +++ b/src/backoffice/views/assemblyteam.py @@ -639,12 +639,12 @@ class AssemblyEditPlacementView(SingleAssemblyTeamMixin, View): except ValueError: logger.exception('Failed to update position of assembly %s', assembly.pk) messages.error(request, gettext('Assembly__edit__position_error')) - return redirect('backoffice:assemblyteam-editposition', pk=assembly.pk) + return redirect('backoffice:assemblyteam-editposition-assembly', pk=assembly.pk) if location_state and location_state != assembly.location_state: if location_state != Assembly.LocationState.NONE and not (assembly.location_data.get('point') or assembly.location_data.get('boundaries')): messages.warning(request, gettext('Assembly__edit__position_missing_on_publish')) - return redirect('backoffice:assemblyteam-editposition', pk=assembly.pk) + return redirect('backoffice:assemblyteam-editposition-assembly', pk=assembly.pk) assembly.location_state = location_state changes['location_state'] = location_state @@ -680,7 +680,7 @@ class AssemblyEditPlacementView(SingleAssemblyTeamMixin, View): messages.warning(request, 'TODO: inform assembly') # we're done saving, redirect to edit view again - return redirect('backoffice:assemblyteam-editposition', pk=assembly.pk) + return redirect('backoffice:assemblyteam-editposition-assembly', pk=assembly.pk) def get(self, *args, **kwargs): context = self.get_context_data() @@ -688,7 +688,7 @@ class AssemblyEditPlacementView(SingleAssemblyTeamMixin, View): loc_data = context['assembly'].location_data or {} context['map_location'] = loc_data.get('point') # context['assembly'].get_location_point_as_json() context['map_boundaries'] = loc_data.get('boundaries') # context['assembly'].get_location_boundaries_as_json() - return render(self.request, 'backoffice/assemblyteam_editposition.html', context) + return render(self.request, 'backoffice/assemblyteam_editposition_assembly.html', context) class AssemblyMessageView(SingleAssemblyTeamMixin, FormView):