release-22.1:Backport!6426

services/grafanads/paths/managedobject.py

@@ -50,7 +50,7 @@ class ManagedObjectJsonDS(JsonDSAPI):
             obj
             and model_id == "sa.ManagedObject"
             and not user.is_superuser
-            and obj.administrative_domain not in UserAccess.get_domains(user)
+            and obj.administrative_domain.id not in UserAccess.get_domains(user)
         ):
             raise HTTPException(status_code=404, detail="Not Access to requested device")
         return obj.bi_id if obj else None

services/web/apps/inv/resourcegroup/views.py

@@ -38,7 +38,7 @@ class ResourceGroupApplication(ExtDocApplication):
     menu = [_("Resource Groups")]
     model = ResourceGroup
     glyph = "object-group"
-    query_fields = ["name"]
+    query_fields = ["name", "description"]
     query_condition = "icontains"
 
     @staticmethod