31 |
31 |
|
32 |
32 |
name = None
|
33 |
33 |
email = None
|
|
34 |
phone = None
|
34 |
35 |
roles = None
|
35 |
36 |
is_active = True
|
36 |
37 |
is_admin = False
|
... | ... | |
105 |
106 |
return self.name
|
106 |
107 |
if self.email:
|
107 |
108 |
return self.email
|
|
109 |
if self.phone:
|
|
110 |
return self.phone
|
108 |
111 |
return str(_('Unknown User'))
|
109 |
112 |
|
110 |
113 |
display_name = property(get_display_name)
|
... | ... | |
129 |
132 |
if field_email:
|
130 |
133 |
self.email = formdata.get(field_email)
|
131 |
134 |
|
|
135 |
if formdata.get('phone'):
|
|
136 |
self.phone = formdata.get('phone')
|
|
137 |
|
|
138 |
field_phone = users_cfg.get('field_phone')
|
|
139 |
if field_phone:
|
|
140 |
self.phone = formdata.get(field_phone)
|
|
141 |
|
132 |
142 |
field_name_values = users_cfg.get('field_name')
|
133 |
143 |
if isinstance(field_name_values, str): # it was a string in previous versions
|
134 |
144 |
field_name_values = [field_name_values]
|
... | ... | |
207 |
217 |
def get_users_with_email(cls, email):
|
208 |
218 |
return cls.select([st.Null('deleted_timestamp'), st.Equal('email', email)])
|
209 |
219 |
|
|
220 |
@classmethod
|
|
221 |
def get_users_with_phone(cls, phone):
|
|
222 |
return cls.select([st.Null('deleted_timestamp'), st.Equal('phone', phone)])
|
|
223 |
|
210 |
224 |
@classmethod
|
211 |
225 |
def get_users_with_name(cls, name):
|
212 |
226 |
return cls.select([st.Null('deleted_timestamp'), st.Equal('name', name)])
|
... | ... | |
216 |
230 |
prefix + 'user': self,
|
217 |
231 |
prefix + 'user_display_name': self.display_name,
|
218 |
232 |
prefix + 'user_email': self.email,
|
|
233 |
prefix + 'user_phone': self.phone,
|
219 |
234 |
}
|
220 |
235 |
formdef = self.get_formdef()
|
221 |
236 |
if formdef:
|
... | ... | |
296 |
311 |
}
|
297 |
312 |
if self.email:
|
298 |
313 |
data['email'] = self.email
|
|
314 |
if self.phone:
|
|
315 |
data['phone'] = self.phone
|
299 |
316 |
if self.name_identifiers:
|
300 |
317 |
data['NameID'] = self.name_identifiers
|
301 |
318 |
if full:
|
... | ... | |
331 |
348 |
comment=_('Session User Display Name'),
|
332 |
349 |
)
|
333 |
350 |
Substitutions.register('session_user_email', category=_('User'), comment=_('Session User Email'))
|
|
351 |
Substitutions.register('session_user_phone', category=_('User'), comment=_('Session User Phone'))
|
334 |
352 |
Substitutions.register_dynamic_source(User)
|
335 |
|
-
|