Runtime error in permissions_endpoint (#513)

martinbpeters · t8y8 · commit 808e5b9dedff · 2019-11-04T13:22:39.000-08:00
Replaced with grantee.tag_name in the permissions_endpoint delete method.

Fixed indentation and type in default_permissions_endpoint.py method delete_default_permission
diff --git a/tableauserverclient/server/endpoint/default_permissions_endpoint.py b/tableauserverclient/server/endpoint/default_permissions_endpoint.py
@@ -38,16 +38,17 @@ def update_default_permissions(self, resource, permissions, content_type):
 
     def delete_default_permission(self, resource, rule, content_type):
         for capability, mode in rule.capabilities.items():
-            # Made readibility better but line is too long, will make this look better
-            url = '{baseurl}/{content_id}/default-permissions/\
-                {content_type}/{grantee_type}/{grantee_id}/{cap}/{mode}'.format(
-                baseurl=self.owner_baseurl(),
-                content_id=resource.id,
-                content_type=content_type,
-                grantee_type=rule.grantee.tag_name + 's',
-                grantee_id=rule.grantee.id,
-                cap=capability,
-                mode=mode)
+            # Made readability better but line is too long, will make this look better
+            url = '{baseurl}/{content_id}/default-permissions/' \
+                '{content_type}/{grantee_type}/{grantee_id}/{cap}/{mode}' \
+                .format(
+                    baseurl=self.owner_baseurl(),
+                    content_id=resource.id,
+                    content_type=content_type,
+                    grantee_type=rule.grantee.tag_name + 's',
+                    grantee_id=rule.grantee.id,
+                    cap=capability,
+                    mode=mode)
 
             logger.debug('Removing {0} permission for capabilty {1}'.format(
                 mode, capability))
diff --git a/tableauserverclient/server/endpoint/permissions_endpoint.py b/tableauserverclient/server/endpoint/permissions_endpoint.py
@@ -48,7 +48,7 @@ def delete(self, resource, rules):
                 url = '{0}/{1}/permissions/{2}/{3}/{4}/{5}'.format(
                     self.owner_baseurl(),
                     resource.id,
-                    rule.grantee.permissions_grantee_type + 's',
+                    rule.grantee.tag_name + 's',
                     rule.grantee.id,
                     capability,
                     mode)
@@ -59,7 +59,7 @@ def delete(self, resource, rules):
                 self.delete_request(url)
 
             logger.info('Deleted permission for {0} {1} item {2}'.format(
-                rule.grantee.permissions_grantee_type,
+                rule.grantee.tag_name,
                 rule.grantee.id,
                 resource.id))
 
