summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-06-03 14:55:24 -0400
committerRob Crittenden <rcritten@redhat.com>2008-06-09 22:15:36 -0400
commit253c5c9b67e2387638cc5ad17bc49276fcf807de (patch)
treedd1394f1951b147e8c57530d9baf7befb13585f8
parent76060364fae3e77a3203576ee9a4510bfd1c3578 (diff)
downloadfreeipa-253c5c9b67e2387638cc5ad17bc49276fcf807de.tar.gz
freeipa-253c5c9b67e2387638cc5ad17bc49276fcf807de.tar.xz
freeipa-253c5c9b67e2387638cc5ad17bc49276fcf807de.zip
Ignore empty values when converting a multi-valued form field back to a list. This will prevent validation errors when validate.UniqueList() is executed.
449785
-rw-r--r--ipa-server/ipa-gui/ipagui/helpers/ipahelper.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipa-server/ipa-gui/ipagui/helpers/ipahelper.py b/ipa-server/ipa-gui/ipagui/helpers/ipahelper.py
index 511e28da..4eb7644c 100644
--- a/ipa-server/ipa-gui/ipagui/helpers/ipahelper.py
+++ b/ipa-server/ipa-gui/ipagui/helpers/ipahelper.py
@@ -53,7 +53,8 @@ def fix_incoming_fields(fields, fieldname, multifieldname):
fields[fieldname] = []
try:
for i in range(len(fields[multifieldname])):
- fields[fieldname].append(fields[multifieldname][i][fieldname])
+ if fields[multifieldname][i][fieldname] is not None and len(fields[multifieldname][i][fieldname]) > 0:
+ fields[fieldname].append(fields[multifieldname][i][fieldname])
del(fields[multifieldname])
except Exception, e:
logging.warn("fix_incoming_fields error: " + str(e))