Always assign current user on "Assign myself"

If a username was entered in the assign box and "Assign myself" clicked,
the code would look up the username instead of assigning current user.
The button would only work if no username was entered.
This commit is contained in:
Ivan Habunek 2019-01-06 13:11:17 +01:00 committed by Drew DeVault
parent eae4543cf5
commit 00d024d01a
1 changed files with 7 additions and 8 deletions

View File

@ -300,14 +300,13 @@ def _assignment_get_ticket(owner, name, ticket_id):
return ticket
def _assignment_get_user(valid):
username = valid.optional('username')
if not username:
if 'myself' in valid:
username = current_user.username
else:
valid.error("Username is required", field="username")
if not valid.ok:
return None
if 'myself' in valid:
username = current_user.username
else:
username = valid.require('username', friendly_name="Username")
if not valid.ok:
return None
if username.startswith("~"):
username = username[1:]