From fda3c2f85d0955a920adee8dad007e6819e109ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Mon, 2 Dec 2024 11:48:16 +0100
Subject: [PATCH] add direct apply button to changesets and fix form button

---
 src/c3nav/editor/templates/editor/changeset.html      | 3 +++
 src/c3nav/editor/templates/editor/changeset_edit.html | 4 +++-
 src/c3nav/editor/views/changes.py                     | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/c3nav/editor/templates/editor/changeset.html b/src/c3nav/editor/templates/editor/changeset.html
index 9443f4fe..f41e826b 100644
--- a/src/c3nav/editor/templates/editor/changeset.html
+++ b/src/c3nav/editor/templates/editor/changeset.html
@@ -138,6 +138,9 @@
             {% if can_propose %}
                 <button type="submit" class="btn btn-primary" name="propose" value="1">{% trans 'Propose' %}</button>
             {% endif %}
+            {% if can_commit %}
+                <button type="submit" class="btn btn-primary" name="commit" value="1">{% trans 'Apply' %}</button>
+            {% endif %}
             {% if can_end_review %}
                 <button type="submit" class="btn btn-danger" name="reject" value="1">{% trans 'Reject' %}</button>
                 <button type="submit" class="btn btn-success" name="apply" value="1">{% trans 'Accept' %}</button>
diff --git a/src/c3nav/editor/templates/editor/changeset_edit.html b/src/c3nav/editor/templates/editor/changeset_edit.html
index d9fea083..cba14fc8 100644
--- a/src/c3nav/editor/templates/editor/changeset_edit.html
+++ b/src/c3nav/editor/templates/editor/changeset_edit.html
@@ -25,7 +25,9 @@
     {% buttons %}
         <a href="{% url 'editor.changesets.detail' pk=changeset.pk %}" class="btn btn-default">{% trans 'Back' %}</a>
         <div class="pull-right">
-            <button type="submit" class="btn btn-primary">{% trans 'Save' %}</button>
+            <button type="submit" class="btn btn-primary">
+                {% if action_label %}{{ action_label }}{% else %}{% trans 'Save' %}{% endif %}
+            </button>
         </div>
     {% endbuttons %}
 </form>
diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py
index d1017cd3..46dff553 100644
--- a/src/c3nav/editor/views/changes.py
+++ b/src/c3nav/editor/views/changes.py
@@ -78,6 +78,7 @@ def changeset_detail(request, pk):
                         return render(request, 'editor/changeset_edit.html', {
                             'changeset': changeset,
                             'action': 'propose',
+                            'action_label': _('Propose'),
                             'form': form,
                         })
 
@@ -109,6 +110,7 @@ def changeset_detail(request, pk):
                         return render(request, 'editor/changeset_edit.html', {
                             'changeset': changeset,
                             'action': 'commit',
+                            'action_label': _('Apply'),
                             'form': form,
                         })
 
@@ -212,6 +214,7 @@ def changeset_detail(request, pk):
         'changeset': changeset,
         'can_edit': can_edit,
         'can_delete': can_delete,
+        'can_commit': changeset.can_commit(request),
         'can_propose': changeset.can_propose(request),
         'can_unpropose': changeset.can_unpropose(request),
         'can_start_review': changeset.can_start_review(request),