extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 18:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure all account options are present. Was on server side, now needs to be client side. See r46713

Browse Source
This commit is contained in:
Nathan Gray 2014-05-13 18:40:31 +00:00
parent 1c31dad881
commit 51c73ddf89
2 changed files with 82 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
etemplate/js/et2_widget_selectAccount.js
View File

@ -113,27 +113,7 @@ var et2_selectAccount = et2_selectbox.extend(
case 'selectbox':
case 'groupmembers':
default:
if (!jQuery.isArray(this.options.select_options))
{
var options = jQuery.extend({}, this.options.select_options);
this.options.select_options = [];
for(var key in options)
{
if (typeof options[key] == 'object')
{
if (typeof(options[key].key) == 'undefined')
{
options[key].value = key;
}
this.options.select_options.push(options[key]);
}
else
{
this.options.select_options.push({value: key, label: options});
}
}
}
this.options.select_options = this.options.select_options.concat(this.egw().accounts(this.options.account_type));
this.options.select_options = this._get_accounts();
break;
}
@ -186,6 +166,9 @@ var et2_selectAccount = et2_selectbox.extend(
this._super.apply(this, arguments);
var type = this.egw().preference('account_selection', 'common');
this.options.select_options = this._get_accounts(e);
if(type == 'primary_group')
{
// Allow search 'inside' this widget
@ -292,6 +275,83 @@ var et2_selectAccount = et2_selectbox.extend(
}
},
/**
* Override parent to make sure accounts are there as options.
*
* Depending on the widget's attributes and the user's preferences, not all selected
* accounts may be in the cache as options, so we fetch the extras to make sure
* we don't lose any.
*/
set_value: function(_value)
{
if(typeof _value == "string" && this.options.multiple && _value.match(/^[,0-9A-Za-z/-_]+$/) !== null)
{
_value = _value.split(',');
}
if(_value)
{
var search = _value;
if (!jQuery.isArray(search))
{
search = [_value];
}
var update_options = false;
for(var j = 0; j < search.length; j++)
{
var not_found = true;
// Options are not indexed, so we must look
for(var i = 0; not_found && i < this.options.select_options.length; i++)
{
if(this.options.select_options[i].value == search[j]) not_found = false;
}
if(not_found)
{
update_options = true;
// Add it in
this.egw().link_title('home-accounts', search[j], function(name) {
this.options.select_options.push({value: search[j],label:name});
}, this);
}
}
if(update_options)
{
this.set_select_options(this.options.select_options);
}
}
this._super.apply(this, arguments);
},
/**
* Get account info for select options from common client-side account cache
*
* @return {Array} select options
*/
_get_accounts: function()
{
if (!jQuery.isArray(this.options.select_options))
{
var options = jQuery.extend({}, this.options.select_options);
this.options.select_options = [];
for(var key in options)
{
if (typeof options[key] == 'object')
{
if (typeof(options[key].key) == 'undefined')
{
options[key].value = key;
}
this.options.select_options.push(options[key]);
}
else
{
this.options.select_options.push({value: key, label: options});
}
}
}
return this.options.select_options.concat(this.egw().accounts(this.options.account_type));
},
/**
* Create & display a way to search & select a single account / group
* Single selection is just link widget

5
etemplate/js/et2_widget_selectbox.js
View File

@ -419,10 +419,7 @@ var et2_selectbox = et2_inputWidget.extend(
"title": et2_readAttrWithDefault(options[i], "title", "")
};
}
if (this.options.type == 'select-account')
{
this.options.select_options = jQuery.extend({},this.options.select_options, this.egw().accounts(this.options.account_type));
}
this.set_select_options(this.options.select_options);
},