Allow to provide default for user attributes
For some reason roles is missing in some cases.
This commit is contained in:
parent
3be167144a
commit
773084f504
1 changed files with 6 additions and 3 deletions
|
@ -154,7 +154,7 @@ for user in target.user.all():
|
||||||
USERMAP[user["email"].lower()] = user
|
USERMAP[user["email"].lower()] = user
|
||||||
|
|
||||||
|
|
||||||
def get_user(userdata, attr="login"):
|
def get_user(userdata, attr="login", default=None):
|
||||||
email = userdata["EmailAddress"]
|
email = userdata["EmailAddress"]
|
||||||
lemail = email.lower()
|
lemail = email.lower()
|
||||||
if lemail in config["usermap"]:
|
if lemail in config["usermap"]:
|
||||||
|
@ -181,7 +181,10 @@ def get_user(userdata, attr="login"):
|
||||||
user = target.user.create(kwargs)
|
user = target.user.create(kwargs)
|
||||||
USERMAP[user["email"].lower()] = user
|
USERMAP[user["email"].lower()] = user
|
||||||
|
|
||||||
return USERMAP[lemail][attr]
|
if default is None:
|
||||||
|
return USERMAP[lemail][attr]
|
||||||
|
return USERMAP[lemail]get(attr, default)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Create tickets
|
# Create tickets
|
||||||
|
@ -243,7 +246,7 @@ for ticket in tickets:
|
||||||
)
|
)
|
||||||
creator_id = get_user(users[item["Creator"]], "id")
|
creator_id = get_user(users[item["Creator"]], "id")
|
||||||
chown = creator_id != new["customer_id"] and "Agent" not in get_user(
|
chown = creator_id != new["customer_id"] and "Agent" not in get_user(
|
||||||
users[item["Creator"]], "roles"
|
users[item["Creator"]], "roles", []
|
||||||
)
|
)
|
||||||
if chown:
|
if chown:
|
||||||
target.ticket.update(new["id"], {"customer_id": creator_id})
|
target.ticket.update(new["id"], {"customer_id": creator_id})
|
||||||
|
|
Loading…
Reference in a new issue