From dd9fc4173d40ccdb73133d8e4128ef7dd49f3e1f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 27 Mar 2020 13:18:51 -0400
Subject: [PATCH] Expose regsitry in templates using existing context processor
 for settings

---
 netbox/extras/plugins/context_processors.py | 10 ----------
 netbox/netbox/settings.py                   |  3 +--
 netbox/templates/inc/nav_menu.html          |  2 +-
 netbox/templates/inc/plugin_menu_items.html |  2 +-
 netbox/utilities/context_processors.py      |  7 +++++--
 5 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 netbox/extras/plugins/context_processors.py

diff --git a/netbox/extras/plugins/context_processors.py b/netbox/extras/plugins/context_processors.py
deleted file mode 100644
index 026c724c7..000000000
--- a/netbox/extras/plugins/context_processors.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from extras.registry import registry
-
-
-def plugin_menu_items(request):
-    """
-    Retrieve and expose all plugin registered navigation menu items.
-    """
-    return {
-        'plugin_menu_items': registry['plugin_menu_items']
-    }
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 932b22611..2f65dee30 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -325,8 +325,7 @@ TEMPLATES = [
                 'django.template.context_processors.media',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'utilities.context_processors.settings',
-                'extras.plugins.context_processors.plugin_menu_items',
+                'utilities.context_processors.settings_and_registry',
             ],
         },
     },
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 8d06ae19f..765df31cc 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -504,7 +504,7 @@
                         </li>
                     </ul>
                 </li>
-                {% if plugin_menu_items %}
+                {% if registry.plugin_menu_items %}
                     {% include 'inc/plugin_menu_items.html' %}
                 {% endif %}
             </ul>
diff --git a/netbox/templates/inc/plugin_menu_items.html b/netbox/templates/inc/plugin_menu_items.html
index 0ba10bd20..16d358eeb 100644
--- a/netbox/templates/inc/plugin_menu_items.html
+++ b/netbox/templates/inc/plugin_menu_items.html
@@ -2,7 +2,7 @@
 <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Plugins <span class="caret"></span></a>
     <ul class="dropdown-menu">
-        {% for section_name, menu_items in plugin_menu_items.items %}
+        {% for section_name, menu_items in registry.plugin_menu_items.items %}
             <li class="dropdown-header">{{ section_name }}</li>
             {% for menu_item in menu_items %}
                 <li{% if menu_item.permissions and not request.user|has_perms:menu_item.permissions %} class="disabled"{% endif %}>
diff --git a/netbox/utilities/context_processors.py b/netbox/utilities/context_processors.py
index 06c5c8784..87a5e39d8 100644
--- a/netbox/utilities/context_processors.py
+++ b/netbox/utilities/context_processors.py
@@ -1,10 +1,13 @@
 from django.conf import settings as django_settings
 
+from extras.registry import registry
 
-def settings(request):
+
+def settings_and_registry(request):
     """
-    Expose Django settings in the template context. Example: {{ settings.DEBUG }}
+    Expose Django settings and NetBox registry stores in the template context. Example: {{ settings.DEBUG }}
     """
     return {
         'settings': django_settings,
+        'registry': registry,
     }