Skip to content

adding project id field to view_item #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2018
Merged

adding project id field to view_item #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion tableauserverclient/models/view_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def __init__(self):
self._name = None
self._owner_id = None
self._preview_image = None
self._project_id = None
self._pdf = None
self._csv = None
self._total_views = None
Expand Down Expand Up @@ -59,6 +60,10 @@ def preview_image(self):
raise UnpopulatedPropertyError(error)
return self._preview_image()

@property
def project_id(self):
return self._project_id

@property
def pdf(self):
if self._pdf is None:
Expand Down Expand Up @@ -97,6 +102,7 @@ def from_xml_element(cls, parsed_response, ns, workbook_id=''):
usage_elem = view_xml.find('.//t:usage', namespaces=ns)
workbook_elem = view_xml.find('.//t:workbook', namespaces=ns)
owner_elem = view_xml.find('.//t:owner', namespaces=ns)
project_elem = view_xml.find('.//t:project', namespaces=ns)
view_item._id = view_xml.get('id', None)
view_item._name = view_xml.get('name', None)
view_item._content_url = view_xml.get('contentUrl', None)
Expand All @@ -107,10 +113,14 @@ def from_xml_element(cls, parsed_response, ns, workbook_id=''):

if owner_elem is not None:
view_item._owner_id = owner_elem.get('id', None)
all_view_items.append(view_item)

if project_elem is not None:
view_item._project_id = project_elem.get('id', None)

if workbook_id:
view_item._workbook_id = workbook_id
elif workbook_elem is not None:
view_item._workbook_id = workbook_elem.get('id', None)

all_view_items.append(view_item)
return all_view_items
2 changes: 2 additions & 0 deletions test/assets/view_get.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
<view id="d79634e1-6063-4ec9-95ff-50acbf609ff5" name="ENDANGERED SAFARI" contentUrl="SafariSample/sheets/ENDANGEREDSAFARI">
<workbook id="3cc6cd06-89ce-4fdc-b935-5294135d6d42" />
<owner id="5de011f8-5aa9-4d5b-b991-f462c8dd6bb7" />
<project id="5241e88d-d384-4fd7-9c2f-648b5247efc5" />
</view>
<view id="fd252f73-593c-4c4e-8584-c032b8022adc" name="Overview" contentUrl="Superstore/sheets/Overview">
<workbook id="6d13b0ca-043d-4d42-8c9d-3f3313ea3a00" />
<owner id="5de011f8-5aa9-4d5b-b991-f462c8dd6bb7" />
<project id="5b534f74-3226-11e8-b47a-cb2e00f738a3" />
</view>
</views>
</tsResponse>
2 changes: 2 additions & 0 deletions test/test_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ def test_get(self):
self.assertEqual('SafariSample/sheets/ENDANGEREDSAFARI', all_views[0].content_url)
self.assertEqual('3cc6cd06-89ce-4fdc-b935-5294135d6d42', all_views[0].workbook_id)
self.assertEqual('5de011f8-5aa9-4d5b-b991-f462c8dd6bb7', all_views[0].owner_id)
self.assertEqual('5241e88d-d384-4fd7-9c2f-648b5247efc5', all_views[0].project_id)

self.assertEqual('fd252f73-593c-4c4e-8584-c032b8022adc', all_views[1].id)
self.assertEqual('Overview', all_views[1].name)
self.assertEqual('Superstore/sheets/Overview', all_views[1].content_url)
self.assertEqual('6d13b0ca-043d-4d42-8c9d-3f3313ea3a00', all_views[1].workbook_id)
self.assertEqual('5de011f8-5aa9-4d5b-b991-f462c8dd6bb7', all_views[1].owner_id)
self.assertEqual('5b534f74-3226-11e8-b47a-cb2e00f738a3', all_views[1].project_id)

def test_get_with_usage(self):
with open(GET_XML_USAGE, 'rb') as f:
Expand Down