[fix] Fixed issues with DeviceAdmin.get_extra_context

openwisp · Mar 1, 2024 · ac01ff7 · ac01ff7
1 parent b3f9a25
commit ac01ff7
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/openwisp_controller/config/admin.py b/openwisp_controller/config/admin.py
@@ -101,7 +101,7 @@ class Media:
             for file_ in ('preview.js', 'unsaved_changes.js', 'switcher.js')
         ]
 
-    def get_extra_context(self, request, pk=None):
+    def get_extra_context(self, pk=None):
         prefix = 'admin:{0}_{1}'.format(
             self.opts.app_label, self.model.__name__.lower()
         )
@@ -136,7 +136,7 @@ def get_extra_context(self, request, pk=None):
 
     def add_view(self, request, form_url='', extra_context=None):
         extra_context = extra_context or {}
-        extra_context.update(self.get_extra_context(request))
+        extra_context.update(self.get_extra_context())
         instance = self.model()
         if hasattr(instance, 'get_default_templates'):
             templates = instance.get_default_templates()
@@ -145,7 +145,7 @@ def add_view(self, request, form_url='', extra_context=None):
         return super().add_view(request, form_url, extra_context)
 
     def change_view(self, request, object_id, form_url='', extra_context=None):
-        extra_context = self.get_extra_context(request, object_id)
+        extra_context = self.get_extra_context(object_id)
         return super().change_view(request, object_id, form_url, extra_context)
 
     def get_urls(self):
@@ -743,10 +743,10 @@ def get_urls(self):
                 pass
         return urls
 
-    def get_extra_context(self, request, pk=None):
-        ctx = super().get_extra_context(request, pk)
+    def get_extra_context(self, pk=None):
+        ctx = super().get_extra_context(pk)
         if pk:
-            device = self.get_object(request, pk)
+            device = self.model.objects.select_related('config').get(id=pk)
             ctx.update(
                 {
                     'show_deactivate': not device.is_deactivated(),
@@ -768,7 +768,7 @@ def get_extra_context(self, request, pk=None):
         return ctx
 
     def add_view(self, request, form_url='', extra_context=None):
-        extra_context = self.get_extra_context(request)
+        extra_context = self.get_extra_context()
         return super().add_view(request, form_url, extra_context)
 
     def get_inlines(self, request, obj):
@@ -1163,14 +1163,14 @@ def schema_view(self, request):
 
     def add_view(self, request, form_url='', extra_context=None):
         extra_context = extra_context or {}
-        extra_context.update(self.get_extra_context(request))
+        extra_context.update(self.get_extra_context())
         return super().add_view(request, form_url, extra_context)
 
     def change_view(self, request, object_id, form_url='', extra_context=None):
-        extra_context = self.get_extra_context(request, object_id)
+        extra_context = self.get_extra_context(object_id)
         return super().change_view(request, object_id, form_url, extra_context)
 
-    def get_extra_context(self, request, pk=None):
+    def get_extra_context(self, pk=None):
         ctx = {
             'relevant_template_url': reverse(
                 'admin:get_relevant_templates', args=['org_id']