Allow suppression of empty entries in multivalued schema fields (#399)

This commit is contained in:
Ross Scroggs
2017-01-25 11:21:58 -08:00
committed by Jay Lee
parent 54371cffff
commit 08f426ba09

View File

@ -6169,7 +6169,8 @@ def getUserAttributes(i, cd, updateCmd=False):
body.setdefault(up, {})
body[up].setdefault(schemaName, {})
i += 1
if sys.argv[i].lower() in [u'multivalue', u'multivalued', u'value']:
multivalue = sys.argv[i].lower()
if multivalue in [u'multivalue', u'multivalued', u'value', u'multinonempty']:
i += 1
body[up][schemaName].setdefault(fieldName, [])
schemaValue = {}
@ -6184,7 +6185,8 @@ def getUserAttributes(i, cd, updateCmd=False):
schemaValue[u'customType'] = sys.argv[i]
i += 1
schemaValue[u'value'] = sys.argv[i]
body[up][schemaName][fieldName].append(schemaValue)
if schemaValue[u'value'] or multivalue != u'multinonempty':
body[up][schemaName][fieldName].append(schemaValue)
else:
body[up][schemaName][fieldName] = sys.argv[i]
i += 1