holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix extra options not used in read only select-account

Browse Source
This commit is contained in:
Nathan Gray 2014-07-21 14:51:47 +00:00
parent 3cade237e2
commit 59e76d78c5
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
etemplate/js/et2_widget_selectAccount.js
View File

@ -855,17 +855,13 @@ var et2_selectAccount_ro = et2_link_string.extend([et2_IDetachedDOM],
// No clicks either // No clicks either
.off(); .off();
if(this.options.select_options && this.options.select_options[_value] || this.options.empty_label) if(this.options.select_options && !jQuery.isEmptyObject(this.options.select_options) || this.options.empty_label)
{ {
if(!_value) if(!_value)
{ {
// Empty label from selectbox // Empty label from selectbox
this.list.append("<li>"+this.options.empty_label+"</li>"); this.list.append("<li>"+this.options.empty_label+"</li>");
} }
else if (this.options.select_options[_value])
{
this.list.append("<li>"+this.options.select_options[_value]+"</li>");
}
else if (typeof _value == 'object') else if (typeof _value == 'object')
{ {
// An array with 0 / empty in it? // An array with 0 / empty in it?
@ -882,6 +878,32 @@ var et2_selectAccount_ro = et2_link_string.extend([et2_IDetachedDOM],
} }
} }
} }
else
{
// Options are not indexed, so we must look
var search = _value;
if (!jQuery.isArray(search))
{
search = [_value];
}
for(var j = 0; j < search.length; j++)
{
var found = false;
// Not having a value to look up causes an infinite loop
if(!search[j]) continue;
for(var i in this.options.select_options)
{
if(this.options.select_options[i].value == search[j])
{
this.list.append("<li>"+this.options.select_options[i].label+"</li>");
break;
}
}
}
}
} }
} }
}); });