From 1ebc75688fcf876adcf184035d367be34691bf92 Mon Sep 17 00:00:00 2001 From: martinbpeters Date: Wed, 23 Oct 2019 08:43:39 +0100 Subject: [PATCH 1/3] Runtime error in permissions_endpoint Runtime error: grantee.permissions_grantee_type replaced with grantee.tag_name in the permissions_endpoint delete method. --- tableauserverclient/server/endpoint/permissions_endpoint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tableauserverclient/server/endpoint/permissions_endpoint.py b/tableauserverclient/server/endpoint/permissions_endpoint.py index 6405f96a0..b28d6fa17 100644 --- 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)) From 883f47f60e56deba11cd07991ad7d3cef2ee247e Mon Sep 17 00:00:00 2001 From: martinbpeters Date: Wed, 23 Oct 2019 09:17:11 +0100 Subject: [PATCH 2/3] delete_default_permission runtime error Runtime error in default_permissions_endpoint.py method delete_default_permission --- .../server/endpoint/default_permissions_endpoint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tableauserverclient/server/endpoint/default_permissions_endpoint.py b/tableauserverclient/server/endpoint/default_permissions_endpoint.py index f2e48db7a..84d9e9430 100644 --- a/tableauserverclient/server/endpoint/default_permissions_endpoint.py +++ b/tableauserverclient/server/endpoint/default_permissions_endpoint.py @@ -39,8 +39,8 @@ 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( + 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, From f834181a3bb49ca0305800f9c4c57bd58bb795a1 Mon Sep 17 00:00:00 2001 From: Martin Peters Date: Mon, 4 Nov 2019 08:07:42 +0000 Subject: [PATCH 3/3] fixed indentation and typo --- .../endpoint/default_permissions_endpoint.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tableauserverclient/server/endpoint/default_permissions_endpoint.py b/tableauserverclient/server/endpoint/default_permissions_endpoint.py index 84d9e9430..9934ee176 100644 --- 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 + # 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) + '{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))