From a94cdbc633809baefe43039e802ae572a12453f6 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 27 Jul 2017 06:49:18 -0700 Subject: [PATCH] In gam create/update user, allow filed names that match print users column names (#537) --- src/gam.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gam.py b/src/gam.py index 32fcedf7..a9d01c6e 100755 --- a/src/gam.py +++ b/src/gam.py @@ -6335,11 +6335,11 @@ def getUserAttributes(i, cd, updateCmd=False): admin_body = {} while i < len(sys.argv): myarg = sys.argv[i].lower() - if myarg == u'firstname': + if myarg in [u'firstname', u'givenname']: body.setdefault(u'name', {}) body[u'name'][u'givenName'] = sys.argv[i+1] i += 2 - elif myarg == u'lastname': + elif myarg in [u'lastname', u'familyname']: body.setdefault(u'name', {}) body[u'name'][u'familyName'] = sys.argv[i+1] i += 2 @@ -6449,7 +6449,7 @@ def getUserAttributes(i, cd, updateCmd=False): i += 1 address[u'customType'] = sys.argv[i] i += 1 - if sys.argv[i].lower() == u'unstructured': + if sys.argv[i].lower() in [u'unstructured', u'formatted']: i += 1 address[u'sourceIsStructured'] = False address[u'formatted'] = sys.argv[i].replace(u'\\n', u'\n')