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: 17 additions & 4 deletions tableauserverclient/models/project_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ def name(self):
def name(self, value):
self._name = value

@property
def owner_id(self):
return self._owner_id

@owner_id.setter
def owner_id(self, value):
raise NotImplementedError('REST API does not currently support updating project owner.')

def is_default(self):
return self.name.lower() == 'default'

Expand All @@ -86,7 +94,7 @@ def _parse_common_tags(self, project_xml, ns):
self._set_values(None, name, description, content_permissions, parent_id)
return self

def _set_values(self, project_id, name, description, content_permissions, parent_id):
def _set_values(self, project_id, name, description, content_permissions, parent_id, owner_id):
if project_id is not None:
self._id = project_id
if name:
Expand All @@ -97,6 +105,8 @@ def _set_values(self, project_id, name, description, content_permissions, parent
self._content_permissions = content_permissions
if parent_id:
self.parent_id = parent_id
if owner_id:
self._owner_id = owner_id

def _set_permissions(self, permissions):
self._permissions = permissions
Expand All @@ -111,9 +121,9 @@ def from_response(cls, resp, ns):
all_project_xml = parsed_response.findall('.//t:project', namespaces=ns)

for project_xml in all_project_xml:
(id, name, description, content_permissions, parent_id) = cls._parse_element(project_xml)
(id, name, description, content_permissions, parent_id, owner_id) = cls._parse_element(project_xml)
project_item = cls(name)
project_item._set_values(id, name, description, content_permissions, parent_id)
project_item._set_values(id, name, description, content_permissions, parent_id, owner_id)
all_project_items.append(project_item)
return all_project_items

Expand All @@ -124,5 +134,8 @@ def _parse_element(project_xml):
description = project_xml.get('description', None)
content_permissions = project_xml.get('contentPermissions', None)
parent_id = project_xml.get('parentProjectId', None)
owner_id = None
for owner in project_xml:
owner_id = owner.get('id', None)

return id, name, description, content_permissions, parent_id
return id, name, description, content_permissions, parent_id, owner_id
6 changes: 3 additions & 3 deletions test/assets/project_get.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<tsResponse xmlns="http://tableau.com/api" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tableau.com/api http://tableau.com/api/ts-api-2.3.xsd">
<pagination pageNumber="1" pageSize="100" totalAvailable="3" />
<projects>
<project id="ee8c6e70-43b6-11e6-af4f-f7b0d8e20760" name="default" description="The default project that was automatically created by Tableau." contentPermissions="ManagedByOwner" />
<project id="1d0304cd-3796-429f-b815-7258370b9b74" name="Tableau" description="" contentPermissions="ManagedByOwner" />
<project id="4cc52973-5e3a-4d1f-a4fb-5b5f73796edf" name="Tableau > Child 1" description="" contentPermissions="ManagedByOwner" parentProjectId="1d0304cd-3796-429f-b815-7258370b9b74" />
<project id="ee8c6e70-43b6-11e6-af4f-f7b0d8e20760" name="default" description="The default project that was automatically created by Tableau." contentPermissions="ManagedByOwner"><owner id="dd2239f6-ddf1-4107-981a-4cf94e415794" /></project>
<project id="1d0304cd-3796-429f-b815-7258370b9b74" name="Tableau" description="" contentPermissions="ManagedByOwner"><owner id="2a47bbf8-8900-4ebb-b0a4-2723bd7c46c3" /></project>
<project id="4cc52973-5e3a-4d1f-a4fb-5b5f73796edf" name="Tableau > Child 1" description="" contentPermissions="ManagedByOwner" parentProjectId="1d0304cd-3796-429f-b815-7258370b9b74"><owner id="dd2239f6-ddf1-4107-981a-4cf94e415794" /></project>
</projects>
</tsResponse>
7 changes: 5 additions & 2 deletions test/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,19 @@ def test_get(self):
all_projects[0].description)
self.assertEqual('ManagedByOwner', all_projects[0].content_permissions)
self.assertEqual(None, all_projects[0].parent_id)
self.assertEqual('dd2239f6-ddf1-4107-981a-4cf94e415794', all_projects[0].owner_id)

self.assertEqual('1d0304cd-3796-429f-b815-7258370b9b74', all_projects[1].id)
self.assertEqual('Tableau', all_projects[1].name)
self.assertEqual('ManagedByOwner', all_projects[1].content_permissions)
self.assertEqual(None, all_projects[1].parent_id)
self.assertEqual('2a47bbf8-8900-4ebb-b0a4-2723bd7c46c3', all_projects[1].owner_id)

self.assertEqual('4cc52973-5e3a-4d1f-a4fb-5b5f73796edf', all_projects[2].id)
self.assertEqual('Tableau > Child 1', all_projects[2].name)
self.assertEqual('ManagedByOwner', all_projects[2].content_permissions)
self.assertEqual('1d0304cd-3796-429f-b815-7258370b9b74', all_projects[2].parent_id)
self.assertEqual('dd2239f6-ddf1-4107-981a-4cf94e415794', all_projects[2].owner_id)

def test_get_before_signin(self):
self.server._auth_token = None
Expand Down Expand Up @@ -156,7 +159,7 @@ def test_populate_workbooks(self):
m.get(self.baseurl + '/9dbd2263-16b5-46e1-9c43-a76bb8ab65fb/default-permissions/workbooks',
text=response_xml)
single_project = TSC.ProjectItem('test', '1d0304cd-3796-429f-b815-7258370b9b74')
single_project.owner_id = 'dd2239f6-ddf1-4107-981a-4cf94e415794'
single_project._owner_id = 'dd2239f6-ddf1-4107-981a-4cf94e415794'
single_project._id = '9dbd2263-16b5-46e1-9c43-a76bb8ab65fb'

self.server.projects.populate_workbook_default_permissions(single_project)
Expand Down Expand Up @@ -227,7 +230,7 @@ def test_delete_workbook_default_permission(self):
single_group._id = 'c8f2773a-c83a-11e8-8c8f-33e6d787b506'

single_project = TSC.ProjectItem('test', '1d0304cd-3796-429f-b815-7258370b9b74')
single_project.owner_id = 'dd2239f6-ddf1-4107-981a-4cf94e415794'
single_project._owner_id = 'dd2239f6-ddf1-4107-981a-4cf94e415794'
single_project._id = '9dbd2263-16b5-46e1-9c43-a76bb8ab65fb'

self.server.projects.populate_workbook_default_permissions(single_project)
Expand Down
5 changes: 5 additions & 0 deletions test/test_project_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@ def test_parent_id(self):
project = TSC.ProjectItem("proj")
project.parent_id = "foo"
self.assertEqual(project.parent_id, "foo")

def test_owner_id(self):
project = TSC.ProjectItem("proj")
with self.assertRaises(NotImplementedError):
project.owner_id = "new_owner"