Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions tableauserverclient/server/endpoint/default_permissions_endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions tableauserverclient/server/endpoint/permissions_endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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))

Expand Down