From 2afdc04ac02bdedf3a95246ab1aff5ec45e3324e Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 7 Nov 2016 11:56:11 -0500
Subject: [PATCH] cleanup inventory admin access syntax

---
 awx/main/access.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/awx/main/access.py b/awx/main/access.py
index 1c907f67fa..d2180cadaa 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -537,11 +537,8 @@ class InventoryAccess(BaseAccess):
     @check_superuser
     def can_admin(self, obj, data):
         # Verify that the user has access to the new organization if moving an
-        # inventory to a new organization.
-        if not self.check_related('organization', Organization, data, obj=obj):
-            return False
-        # Otherwise, just check for admin permission.
-        return self.user in obj.admin_role
+        # inventory to a new organization.  Otherwise, just check for admin permission.
+        return self.check_related('organization', Organization, data, obj=obj) and self.user in obj.admin_role
 
     def can_delete(self, obj):
         is_can_admin = self.can_admin(obj, None)