IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Generate the multi-value entries needed when redirecting to the edit_user

Browse Source 
page. This avoids a Nonetype error.

Resolves 432106
This commit is contained in:
Rob Crittenden 2008-02-08 17:34:23 -05:00
parent 1a38b6dfdf
commit 5f86f5a5fd
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ipa-server/ipa-gui/ipagui/subcontrollers/user.py
View File

@ -107,6 +107,38 @@ class UserController(IPAController):
user_new_form.validator.add_field(s['field'], validator) user_new_form.validator.add_field(s['field'], validator)
user_edit_form.validator.add_field(s['field'], validator) user_edit_form.validator.add_field(s['field'], validator)
def initialize_mv_fields(self, user_dict):
"""We use a separate attribute to store multi-values while on
the edit page. It is important that this be at least []. If
it is None it will cause an error to be thrown."""
# Load potential multi-valued fields
if isinstance(user_dict['cn'], str):
user_dict['cn'] = [user_dict['cn']]
user_dict['cns'] = ipahelper.setup_mv_fields(user_dict['cn'], 'cn')
if isinstance(user_dict.get('telephonenumber',''), str):
user_dict['telephonenumber'] = [user_dict.get('telephonenumber')]
user_dict['telephonenumbers'] = ipahelper.setup_mv_fields(user_dict.get('telephonenumber'), 'telephonenumber')
if isinstance(user_dict.get('facsimiletelephonenumber',''), str):
user_dict['facsimiletelephonenumber'] = [user_dict.get('facsimiletelephonenumber')]
user_dict['facsimiletelephonenumbers'] = ipahelper.setup_mv_fields(user_dict.get('facsimiletelephonenumber'), 'facsimiletelephonenumber')
if isinstance(user_dict.get('mobile',''), str):
user_dict['mobile'] = [user_dict.get('mobile')]
user_dict['mobiles'] = ipahelper.setup_mv_fields(user_dict.get('mobile'), 'mobile')
if isinstance(user_dict.get('pager',''), str):
user_dict['pager'] = [user_dict.get('pager')]
user_dict['pagers'] = ipahelper.setup_mv_fields(user_dict.get('pager'), 'pager')
if isinstance(user_dict.get('homephone',''), str):
user_dict['homephone'] = [user_dict.get('homephone')]
user_dict['homephones'] = ipahelper.setup_mv_fields(user_dict.get('homephone'), 'homephone')
return user_dict
@expose() @expose()
def index(self): def index(self):
raise turbogears.redirect("/user/list") raise turbogears.redirect("/user/list")
@ -249,6 +281,7 @@ class UserController(IPAController):
failed_adds = [] failed_adds = []
try: try:
dnadds = kw.get('dnadd') dnadds = kw.get('dnadd')
cherrypy.session['uid'] = user_dict.get('uid')
if dnadds != None: if dnadds != None:
if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)): if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
dnadds = [dnadds] dnadds = [dnadds]
@ -263,11 +296,16 @@ class UserController(IPAController):
message += "There was an error adding groups.<br />" message += "There was an error adding groups.<br />"
message += "Failures have been preserved in the add/remove lists." message += "Failures have been preserved in the add/remove lists."
turbogears.flash(message) turbogears.flash(message)
# Setup any multi-value fields, otherwise you'll get:
# 'NoneType' object is not iterable
user_dict = self.initialize_mv_fields(user_dict)
return dict(form=user_edit_form, user=user_dict, return dict(form=user_edit_form, user=user_dict,
user_groups=user_groups_dicts, user_groups=user_groups_dicts,
tg_template='ipagui.templates.useredit') tg_template='ipagui.templates.useredit')
turbogears.flash("%s added!" % kw['uid']) turbogears.flash("%s added!" % kw['uid'])
print "Succeeded "
raise turbogears.redirect('/user/show', uid=kw['uid']) raise turbogears.redirect('/user/show', uid=kw['uid'])
@expose("ipagui.templates.dynamiceditsearch") @expose("ipagui.templates.dynamiceditsearch")
@ -316,30 +354,7 @@ class UserController(IPAController):
raise turbogears.redirect('/') raise turbogears.redirect('/')
user_dict = user.toDict() user_dict = user.toDict()
# Load potential multi-valued fields user_dict = self.initialize_mv_fields(user_dict)
if isinstance(user_dict['cn'], str):
user_dict['cn'] = [user_dict['cn']]
user_dict['cns'] = ipahelper.setup_mv_fields(user_dict['cn'], 'cn')
if isinstance(user_dict.get('telephonenumber',''), str):
user_dict['telephonenumber'] = [user_dict.get('telephonenumber')]
user_dict['telephonenumbers'] = ipahelper.setup_mv_fields(user_dict.get('telephonenumber'), 'telephonenumber')
if isinstance(user_dict.get('facsimiletelephonenumber',''), str):
user_dict['facsimiletelephonenumber'] = [user_dict.get('facsimiletelephonenumber')]
user_dict['facsimiletelephonenumbers'] = ipahelper.setup_mv_fields(user_dict.get('facsimiletelephonenumber'), 'facsimiletelephonenumber')
if isinstance(user_dict.get('mobile',''), str):
user_dict['mobile'] = [user_dict.get('mobile')]
user_dict['mobiles'] = ipahelper.setup_mv_fields(user_dict.get('mobile'), 'mobile')
if isinstance(user_dict.get('pager',''), str):
user_dict['pager'] = [user_dict.get('pager')]
user_dict['pagers'] = ipahelper.setup_mv_fields(user_dict.get('pager'), 'pager')
if isinstance(user_dict.get('homephone',''), str):
user_dict['homephone'] = [user_dict.get('homephone')]
user_dict['homephones'] = ipahelper.setup_mv_fields(user_dict.get('homephone'), 'homephone')
# Edit shouldn't fill in the password field. # Edit shouldn't fill in the password field.
if user_dict.has_key('userpassword'): if user_dict.has_key('userpassword'):