8000 tyler feedback · cbates10/server-client-python@a90fcf2 · GitHub
[go: up one dir, main page]
Skip to content

Commit a90fcf2

Browse files
jacalatajacalata
committed
tyler feedback
1 parent 6e3f96d commit a90fcf2

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

‎tableauserverclient/models/group_item.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import xml.etree.ElementTree as ET
22
from .exceptions import UnpopulatedPropertyError
3-
from .property_decorators import property_not_empty
3+
from .property_decorators import property_not_empty, property_is_enum
44
from .reference_item import ResourceReference
5+
from .user_item import UserItem
56

67

78
class GroupItem(object):
@@ -51,6 +52,7 @@ def minimum_site_role(self):
5152
return self._minimum_site_role
5253

5354
@minimum_site_role.setter
55+
@property_is_enum(UserItem.Roles)
5456
def minimum_site_role(self, value):
5557
self._minimum_site_role = value
5658

‎tableauserverclient/server/endpoint/groups_endpoint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ def delete(self, group_id):
5858
logger.info('Deleted single group (ID: {0})'.format(group_id))
5959

6060
@api(version="2.0")
61-
def update(self, group_item, default_site_role=UNLICENSED_USER, asJob=False):
61+
def update(self, group_item, default_site_role=UNLICENSED_USER, as_job=False):
6262
if not group_item.id:
6363
error = "Group item missing ID."
6464
raise MissingRequiredFieldError(error)
6565
url = "{0}/{1}".format(self.baseurl, group_item.id)
6666
update_req = RequestFactory.Group.update_req(group_item, default_site_role)
6767
server_response = self.put_request(url, update_req)
6868
logger.info('Updated group item (ID: {0})'.format(group_item.id))
69-
if (asJob):
69+
if (as_job):
7070
return JobItem.from_response(server_response.content, self.parent_srv.namespace)[0]
7171
else:
7272
return GroupItem.from_response(server_response.content, self.parent_srv.namespace)[0]

‎tableauserverclient/server/request_factory.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ def create_local_req(self, group_item):
242242
xml_request = ET.Element('tsRequest')
243243
group_element = ET.SubElement(xml_request, 'group')
244244
group_element.attrib['name'] = group_item.name
245-
if (group_item.license_mode is not None):
245+
if group_item.license_mode is not None:
246246
group_element.attrib['grantLicenseMode'] = group_item.license_mode
247-
if (group_item.minimum_site_role is not None):
247+
if group_item.minimum_site_role is not None:
248248
group_element.attrib['SiteRole'] = group_item.minimum_site_role
249249
return ET.tostring(xml_request)
250250

@@ -254,19 +254,19 @@ def create_ad_req(self, group_item):
254254
group_element.attrib['name'] = group_item.name
255255
import_element = ET.SubElement(group_element, 'import')
256256
import_element.attrib['source'] = "ActiveDirectory"
257-
if (group_item.domain_name is None):
257+
if group_item.domain_name is None:
258258
error = "Group Domain undefined."
259259
raise ValueError(error)
260260

261261
import_element.attrib['domainName'] = group_item.domain_name
262-
if (group_item.license_mode is not None):
262+
if group_item.license_mode is not None:
263263
import_element.attrib['grantLicenseMode'] = group_item.license
264-
if (group_item.minimum_site_role is not None):
264+
if group_item.minimum_site_role is not None:
265265
import_element.attrib['SiteRole'] = group_item.minimum_site_role
266266
return ET.tostring(xml_request)
267267

268268
def update_req(self, group_item, default_site_role=None):
269-
if (default_site_role is not None):
269+
if default_site_role is not None:
270270
group_item.minimum_site_role = default_site_role
271271
xml_request = ET.Element('tsRequest')
272272
group_element = ET.SubElement(xml_request, 'group')

0 commit comments

Comments
 (0)
0