mirror of
https://github.com/GAM-team/GAM.git
synced 2026-06-29 10:21:35 +00:00
Updated user attribute replace <Tag> <UserReplacement> to allow field:photourl
This commit is contained in:
@@ -5751,7 +5751,7 @@ def shlexSplitListStatus(entity, dataDelimiter=' ,'):
|
||||
return (False, str(e))
|
||||
|
||||
def getQueries(myarg):
|
||||
if myarg == 'query':
|
||||
if myarg in {'query', 'filter'}:
|
||||
return [getString(Cmd.OB_QUERY)]
|
||||
return shlexSplitList(getString(Cmd.OB_QUERY_LIST))
|
||||
|
||||
@@ -13971,6 +13971,7 @@ TAG_FIELD_SUBFIELD_CHOICE_MAP = {
|
||||
'otheremails': ('emails', TAG_OTHEREMAIL_ARGUMENT_TO_FIELD_MAP),
|
||||
'phone': ('phones', TAG_PHONE_ARGUMENT_TO_FIELD_MAP),
|
||||
'phones': ('phones', TAG_PHONE_ARGUMENT_TO_FIELD_MAP),
|
||||
'photourl': ('thumbnailPhotoUrl', {'': 'thumbnailPhotoUrl'}),
|
||||
'posix': ('posixAccounts', TAG_POSIXACCOUNT_ARGUMENT_TO_FIELD_MAP),
|
||||
'posixaccounts': ('posixAccounts', TAG_POSIXACCOUNT_ARGUMENT_TO_FIELD_MAP),
|
||||
'relation': ('relations', TAG_RELATION_ARGUMENT_TO_FIELD_MAP),
|
||||
@@ -14014,6 +14015,8 @@ def _getTagReplacement(tagReplacements, allowSubs):
|
||||
else:
|
||||
Cmd.Backup()
|
||||
usageErrorExit(Msg.INVALID_TAG_SPECIFICATION)
|
||||
elif field == 'photourl':
|
||||
subfield = matchfield = matchvalue = ''
|
||||
else:
|
||||
field = ''
|
||||
if not field or field not in TAG_FIELD_SUBFIELD_CHOICE_MAP:
|
||||
@@ -14128,6 +14131,8 @@ def _getTagReplacementFieldValues(user, i, count, tagReplacements, results=None)
|
||||
break
|
||||
else:
|
||||
data = {}
|
||||
elif field == 'thumbnailPhotoUrl':
|
||||
data = results
|
||||
else:
|
||||
data = results.get(field, {})
|
||||
tag['value'] = str(data.get(tag['subfield'], ''))
|
||||
|
||||
Reference in New Issue
Block a user