summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-12-10 18:00:05 +0100
committerVincent Petry <pvince81@owncloud.com>2015-12-10 18:00:05 +0100
commitf11314b761d62dac6be26f337edeedaeab3f0037 (patch)
tree6a7bb842a93f393e107f4d238ffbe578abae3d56 /apps
parentcf009768f968d24feafa73f7dcd8e7a801f62db1 (diff)
parent6bedaf0f69a89785457424befb46431289324b4c (diff)
downloadnextcloud-server-f11314b761d62dac6be26f337edeedaeab3f0037.tar.gz
nextcloud-server-f11314b761d62dac6be26f337edeedaeab3f0037.zip
Merge pull request #21091 from owncloud/backport-20995-stable8.1
[backport] [stable8.1] ensure multiselect always receives an array when setting its value, f…
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/js/wizard/wizardTabGeneric.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js
index b755f3ca060..7372fedf5bd 100644
--- a/apps/user_ldap/js/wizard/wizardTabGeneric.js
+++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js
@@ -192,9 +192,13 @@ OCA = OCA || {};
return;
}
- // deal with text area
+ // special cases: deal with text area and multiselect
if ($element.is('textarea') && $.isArray(value)) {
value = value.join("\n");
+ } else if($element.hasClass(this.multiSelectPluginClass)) {
+ if(!_.isArray(value)) {
+ value = value.split("\n");
+ }
}
if ($element.is('span')) {