#986: Adds support for deleting custom nav items

openlibhums · Mar 13, 2019 · 85dfef1 · 85dfef1
1 parent 0b63ff4
commit 85dfef1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/cms/views.py b/src/cms/views.py
@@ -148,6 +148,12 @@ def nav(request, nav_id=None):
         request.journal.save()
         return redirect(reverse('cms_nav'))
 
+    elif "delete_nav" in request.POST:
+        nav_to_delete = get_object_or_404(
+                models.NavigationItem,
+                pk=request.POST["delete_nav"])
+        nav_to_delete.delete()
+
     if request.POST:
         if nav_to_edit:
             form = forms.NavForm(request.POST, request=request, instance=nav_to_edit)
@@ -164,6 +170,7 @@ def nav(request, nav_id=None):
 
     template = 'cms/nav.html'
     context = {
+        'nav_item_to_edit': nav_to_edit,
         'form': form,
         'top_nav_items': top_nav_items,
     }

diff --git a/src/templates/admin/cms/nav.html b/src/templates/admin/cms/nav.html
@@ -18,7 +18,9 @@
             <form method="POST">
                 {% csrf_token %}
                 {{ form|foundation }}
-                <button type="submit" name="submit" class="success button">Update</button>
+                <button type="submit" name="submit" class="success button">
+                    {% if nav_item_to_edit  %}Update{% else %}Create{% endif %}
+                </button>
             </form>
         </div>
     </div>

diff --git a/src/templates/admin/elements/cms_nav.html b/src/templates/admin/elements/cms_nav.html
@@ -8,14 +8,18 @@
             </li>
         {% endif %}
         {% for nav in top_nav_items %}
-            <li>{{ nav.link_name }} ({{ nav.link }}) <a href="{% url 'cms_nav_edit' nav.pk %}"><i
-                    class="fa fa-edit">
-                &nbsp;</i></a></li>
+            <li>{{ nav.link_name }} ({{ nav.link }})
+                <a class="tiny button" href="{% url 'cms_nav_edit' nav.pk %}"><i class="fa fa-edit"></i></a>
+                <button class="tiny button" name="delete_nav" value="{{ nav.pk }}"><i class="fa fa-times"></i>
+            </li>
             {% if nav.sub_nav_items %}
                 <ul>
                     {% for sub_nav in nav.sub_nav_items %}
-                        <li>{{ sub_nav.link_name }} ({{ sub_nav.link }}) <a
-                                href="{% url 'cms_nav_edit' sub_nav.pk %}"><i class="fa fa-edit">&nbsp;</i></a>
+                        <li>{{ sub_nav.link_name }} ({{ sub_nav.link }})
+                            <a class="tiny button" href="{% url 'cms_nav_edit' sub_nav.pk %}"><i class="fa fa-edit"></i></a>
+                            <button class="tiny button" name="delete_nav" value="{{ sub_nav.pk }}">
+                                <i class="fa fa-times"></i>
+                            </button>
                         </li>
                     {% endfor %}
                 </ul>
@@ -64,4 +68,4 @@
             </li>
         {% endif %}
     </ul>
-</form>
+</form>