From e5cd5a40c399692cd62798629966a5fe706d00a5 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
Date: Fri, 1 Feb 2019 04:15:16 -0400
Subject: [PATCH] Improve ACL navigation

Update the ACL delete icon for uniformity.

Insert both the ACL and object in the view to also
display the ACL permissions and delete view when
viewing the ACL of an object.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
---
 mayan/apps/acls/apps.py  |  6 ++++--
 mayan/apps/acls/icons.py |  2 +-
 mayan/apps/acls/views.py | 18 +++++++++++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py
index ba66f8a458..5d763cd628 100644
--- a/mayan/apps/acls/apps.py
+++ b/mayan/apps/acls/apps.py
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar
+from mayan.apps.common import (
+    MayanAppConfig, menu_object, menu_secondary, menu_sidebar
+)
 from mayan.apps.navigation import SourceColumn
 
 from .classes import ModelPermission
@@ -35,7 +37,7 @@ class ACLsApp(MayanAppConfig):
         )
 
         menu_object.bind_links(
-            links=(link_acl_permissions, link_acl_delete),
+            links=(link_acl_permissions, link_acl_delete,),
             sources=(AccessControlList,)
         )
         menu_sidebar.bind_links(
diff --git a/mayan/apps/acls/icons.py b/mayan/apps/acls/icons.py
index 00cda1f009..1ecd7f5bdb 100644
--- a/mayan/apps/acls/icons.py
+++ b/mayan/apps/acls/icons.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from mayan.apps.appearance.classes import Icon
 
-icon_acl_delete = Icon(driver_name='fontawesome', symbol='minus')
+icon_acl_delete = Icon(driver_name='fontawesome', symbol='times')
 icon_acl_list = Icon(driver_name='fontawesome', symbol='lock')
 icon_acl_new = Icon(
     driver_name='fontawesome-dual', primary_symbol='lock',
diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py
index b92b7d5f16..f4d43ffdd1 100644
--- a/mayan/apps/acls/views.py
+++ b/mayan/apps/acls/views.py
@@ -81,8 +81,12 @@ class ACLDeleteView(SingleObjectDeleteView):
     pk_url_kwarg = 'acl_id'
 
     def get_extra_context(self):
+        acl = self.get_object()
+
         return {
-            'object': self.get_object().content_object,
+            'acl': acl,
+            'object': acl.content_object,
+            'navigation_object_list': ('object', 'acl'),
             'title': _('Delete ACL: %s') % self.get_object(),
         }
 
@@ -187,12 +191,16 @@ class ACLPermissionsView(AssignRemoveView):
         )
 
     def get_extra_context(self):
+        acl = self.get_object()
+
         return {
-            'object': self.get_object().content_object,
+            'acl': acl,
+            'object': acl.content_object,
+            'navigation_object_list': ('object', 'acl'),
             'title': _('Role "%(role)s" permission\'s for "%(object)s"') % {
-                'role': self.get_object().role,
-                'object': self.get_object().content_object,
-            },
+                'role': acl.role,
+                'object': acl.content_object,
+            }
         }
 
     def get_granted_list(self):