diff options
| -rw-r--r-- | install/static/details.js | 23 | ||||
| -rw-r--r-- | ipalib/plugins/baseldap.py | 8 |
2 files changed, 17 insertions, 14 deletions
diff --git a/install/static/details.js b/install/static/details.js index f9da3f99..d47cfe8b 100644 --- a/install/static/details.js +++ b/install/static/details.js @@ -92,16 +92,8 @@ function ipa_details_update(pkey, on_win, on_fail) return; var attr = dt.attr('title'); - if (!attr) - return; - - if (attr.indexOf('call_') == 0) { - var func = window[attr.substr(5)]; - if (!func) - return; - func(dt, modlist, IPA_DETAILS_UPDATE); + if (!attr || attr.indexOf('call_') == 0) return; - } var param_info = ipa_get_param_info(attr); if (param_info) { @@ -118,8 +110,19 @@ function ipa_details_update(pkey, on_win, on_fail) var jobj = $(this); var attr = jobj.attr('title'); - if (!attr || attr.indexOf('call_') == 0) + if (!attr) + return; + + if (attr.indexOf('call_') == 0) { + var func = window[attr.substr(5)]; + if (func) + func(jobj, modlist, IPA_DETAILS_UPDATE); return; + } + + var param_info = ipa_get_param_info(attr); + if (param_info && param_info['primary_key']) + return; var next = jobj.next('dd'); if ((!next.length) || (!next.children('input').length)) diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index f3e5b0fe..69bda6d8 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -49,10 +49,10 @@ def get_attributes(attrs): Given a list of values in the form name=value, return a list of name. """ attrlist=[] - for attr in attrs: - m = re.match("\s*(.*?)\s*=\s*(.*?)\s*$", attr) - attrlist.append(str(m.group(1)).lower()) - + if attrs: + for attr in attrs: + m = re.match("\s*(.*?)\s*=\s*(.*?)\s*$", attr) + attrlist.append(str(m.group(1)).lower()) return attrlist |