Commit 13c1839b authored by Andrey Vertiprahov's avatar Andrey Vertiprahov
Browse files

Merge branch 'cherry-pick-14a4eca4' into 'release-22.1'

release-22.1:Backport!6426

See merge request !6428
parents 5f6fe851 04fde33f
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment