From 80d9fe6573af41a1172e7e9b3b1cce17422b2f7b Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Sat, 21 Jan 2023 18:05:18 +0530
Subject: [PATCH] Added clone fields and cleaned templates (#80)

---
 netbox_acls/models/access_list_rules.py       |   2 +
 netbox_acls/models/access_lists.py            |   7 +
 .../templates/netbox_acls/accesslist.html     | 129 +++++++-----------
 .../netbox_acls/aclinterfaceassignment.html   |  32 -----
 4 files changed, 60 insertions(+), 110 deletions(-)

diff --git a/netbox_acls/models/access_list_rules.py b/netbox_acls/models/access_list_rules.py
index 2dff662..f37aca8 100644
--- a/netbox_acls/models/access_list_rules.py
+++ b/netbox_acls/models/access_list_rules.py
@@ -52,6 +52,8 @@ class ACLRule(NetBoxModel):
         verbose_name="Source Prefix",
     )
 
+    clone_fields = ("access_list", "action", "source_prefix")
+
     def __str__(self):
         return f"{self.access_list}: Rule {self.index}"
 
diff --git a/netbox_acls/models/access_lists.py b/netbox_acls/models/access_lists.py
index 729e024..1feb635 100644
--- a/netbox_acls/models/access_lists.py
+++ b/netbox_acls/models/access_lists.py
@@ -59,6 +59,11 @@ class AccessList(NetBoxModel):
         blank=True,
     )
 
+    clone_fields = (
+        "type",
+        "default_action",
+    )
+
     class Meta:
         unique_together = ["assigned_object_type", "assigned_object_id", "name"]
         ordering = ["assigned_object_type", "assigned_object_id", "name"]
@@ -113,6 +118,8 @@ class ACLInterfaceAssignment(NetBoxModel):
         blank=True,
     )
 
+    clone_fields = ("access_list", "direction")
+
     class Meta:
         unique_together = [
             "assigned_object_type",
diff --git a/netbox_acls/templates/netbox_acls/accesslist.html b/netbox_acls/templates/netbox_acls/accesslist.html
index 6870f30..5821402 100644
--- a/netbox_acls/templates/netbox_acls/accesslist.html
+++ b/netbox_acls/templates/netbox_acls/accesslist.html
@@ -1,90 +1,63 @@
 {% extends 'generic/object.html' %}
 {% load render_table from django_tables2 %}
 
-{% block breadcrumbs %}
-<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_acls:accesslist_list' %}">Access Lists</a></li>
-{% endblock %}
-{% block controls %}
-<div class="pull-right noprint">
+{% block extra_controls %}
     {% if perms.netbox_acls.change_policy %}
-    {%     if object.type == 'extended' %}
-    <a href="{% url 'plugins:netbox_acls:aclextendedrule_add' %}?access_list={{ object.pk }}" class="btn btn-success">
-    {%     elif object.type == 'standard' %}
-    <a href="{% url 'plugins:netbox_acls:aclstandardrule_add' %}?access_list={{ object.pk }}" class="btn btn-success">
-    {%     endif %}
-        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Rule
-    </a>
-    <a href="{% url 'plugins:netbox_acls:accesslist_edit' pk=object.pk %}" class="btn btn-warning">
-        <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
+        {% if object.type == 'extended' %}
+            <a href="{% url 'plugins:netbox_acls:aclextendedrule_add' %}?access_list={{ object.pk }}" class="btn btn-sm btn-primary">
+        {% elif object.type == 'standard' %}
+            <a href="{% url 'plugins:netbox_acls:aclstandardrule_add' %}?access_list={{ object.pk }}" class="btn btn-sm btn-primary">
+        {% endif %}
+    <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Rule
     </a>
     {% endif %}
-    {% if perms.netbox_acls.delete_policy %}
-    <a href="{% url 'plugins:netbox_acls:accesslist_delete' pk=object.pk %}" class="btn btn-danger">
-        <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
-    </a>
-    {% endif %}
-</div>
-{% endblock controls %}
-{% block tabs %}
-<ul class="nav nav-tabs px-3">
-    {% block tab_items %}
-    <li class="nav-item" role="presentation">
-        <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
-    </li>
-    {% endblock tab_items %}
-    {% if perms.extras.view_objectchange %}
-    <li role="presentation" class="nav-item">
-        <a href="{% url 'plugins:netbox_acls:accesslist_changelog' pk=object.pk %}" class="nav-link{% if active_tab == 'changelog'%} active{% endif %}">Change Log</a>
-    </li>
-    {% endif %}
-</ul>
-{% endblock tabs %}
+{% endblock extra_controls %}
 
 {% block content %}
-  <div class="row mb-3">
-    <div class="col col-md-6">
-      <div class="card">
-        <h5 class="card-header">Access List</h5>
-        <div class="card-body">
-          <table class="table table-hover attr-table">
-            <tr>
-              <th scope="row">Type</th>
-              <td>{{ object.get_type_display }}</td>
-            </tr>
-            <tr>
-              <th scope="row">Default Action</th>
-              <td>{% badge object.get_default_action_display bg_color=object.get_default_action_color %}</td>
-            </tr>
-            <tr>
-              <th scope="row">Rules</th>
-              {% if object.type == 'standard' %}
-              <td>{{ object.aclstandardrules.count|placeholder }}</td>
-              {% elif object.type == 'extended' %}
-              <td>{{ object.aclextendedrules.count|placeholder }}</td>
-              {% endif %}
-              <tr>
-                <th scope="row">Assigned Host</th>
-                <td>{{ object.assigned_object|linkify }}</td>
-              </tr>
-            </tr>
-          </table>
+    <div class="row mb-3">
+        <div class="col col-md-6">
+            <div class="card">
+                <h5 class="card-header">Access List</h5>
+                <div class="card-body">
+                    <table class="table table-hover attr-table">
+                        <tr>
+                            <th scope="row">Type</th>
+                            <td>{{ object.get_type_display }}</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Default Action</th>
+                            <td>{% badge object.get_default_action_display bg_color=object.get_default_action_color %}</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Rules</th>
+                            {% if object.type == 'standard' %}
+                                <td>{{ object.aclstandardrules.count|placeholder }}</td>
+                            {% elif object.type == 'extended' %}
+                                <td>{{ object.aclextendedrules.count|placeholder }}</td>
+                            {% endif %}
+                        </tr>
+                        <tr>
+                            <th scope="row">Assigned Host</th>
+                            <td>{{ object.assigned_object|linkify }}</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            {% include 'inc/panels/custom_fields.html' %}
         </div>
-      </div>
-      {% include 'inc/panels/custom_fields.html' %}
-    </div>
-    <div class="col col-md-6">
-      {% include 'inc/panels/tags.html' %}
-      {% include 'inc/panels/comments.html' %}
-    </div>
-  </div>
-  <div class="row">
-    <div class="col col-md-12">
-      <div class="card">
-        <h5 class="card-header">{{ object.get_type_display }} Rules</h5>
-        <div class="card-body table-responsive">
-          {% render_table rules_table %}
+        <div class="col col-md-6">
+            {% include 'inc/panels/tags.html' %}
+            {% include 'inc/panels/comments.html' %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col col-md-12">
+            <div class="card">
+                <h5 class="card-header">{{ object.get_type_display }} Rules</h5>
+                <div class="card-body table-responsive">
+                    {% render_table rules_table %}
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 {% endblock content %}
diff --git a/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html b/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html
index b46a26a..4cabeb0 100644
--- a/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html
+++ b/netbox_acls/templates/netbox_acls/aclinterfaceassignment.html
@@ -1,38 +1,6 @@
 {% extends 'generic/object.html' %}
 {% load render_table from django_tables2 %}
 
-{% block breadcrumbs %}
-<li class="breadcrumb-item"><a href="{% url 'plugins:netbox_acls:aclinterfaceassignment_list' %}">ACL Interface Assignments</a></li>
-{% endblock %}
-{% block controls %}
-<div class="pull-right noprint">
-    {% if perms.netbox_acls.change_policy %}
-    <a href="{% url 'plugins:netbox_acls:aclinterfaceassignment_edit' pk=object.pk %}" class="btn btn-warning">
-        <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
-    </a>
-    {% endif %}
-    {% if perms.netbox_acls.delete_policy %}
-    <a href="{% url 'plugins:netbox_acls:aclinterfaceassignment_delete' pk=object.pk %}" class="btn btn-danger">
-        <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
-    </a>
-    {% endif %}
-</div>
-{% endblock controls %}
-{% block tabs %}
-<ul class="nav nav-tabs px-3">
-    {% block tab_items %}
-    <li class="nav-item" role="presentation">
-        <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
-    </li>
-    {% endblock tab_items %}
-    {% if perms.extras.view_objectchange %}
-    <li role="presentation" class="nav-item">
-        <a href="{% url 'plugins:netbox_acls:aclinterfaceassignment_changelog' pk=object.pk %}" class="nav-link{% if active_tab == 'changelog'%} active{% endif %}">Change Log</a>
-    </li>
-    {% endif %}
-</ul>
-{% endblock tabs %}
-
 {% block content %}
   <div class="row mb-3">
     <div class="col col-md-6">