extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix client-side nextmatch to use select-options from get_rows data for select-widgets in newly rendered rows

Browse Source
This commit is contained in:
Ralf Becker 2016-04-05 15:05:31 +00:00
parent 4d22204945
commit 4591f5c8b4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_extension_nextmatch_controller.js
View File

@ -565,6 +565,8 @@ var et2_nextmatch_controller = (function(){ "use strict"; return et2_dataview_co
{
this.self._rowProvider.categories = null;
}
// update array mgr so select widgets in row also get refreshed options
nm.getParent().getArrayMgr('sel_options').data[id] = _response.rows.sel_options[id];
}
}
else

10
api/js/etemplate/et2_widget_selectbox.js
View File

@ -165,7 +165,9 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend(
typeof _attrs.select_options == 'undefined' || _attrs.select_options === null
)
{
return;
// do not return inside nextmatch, as get_rows data might have changed select_options
// for performance reasons we only do it for first row, which should have id "0[...]"
if (this.getParent()._type != 'rowWidget' || !_attrs.id || _attrs.id[0] != '0') return;
}
var sel_options = et2_selectbox.find_select_options(this, _attrs['select_options'], _attrs);
@ -1335,7 +1337,7 @@ var et2_selectbox_ro = (function(){ "use strict"; return et2_selectbox.extend([e
* @param {array} _attrs array to add further attributes to
*/
getDetachedAttributes: function(_attrs) {
_attrs.push("value");
_attrs.push("value",'select_options');
},
/**
@ -1360,6 +1362,10 @@ var et2_selectbox_ro = (function(){ "use strict"; return et2_selectbox.extend([e
*/
setDetachedAttributes: function(_nodes, _values) {
this.span = jQuery(_nodes[0]);
if (typeof _values.select_options != 'undefined')
{
this.set_select_options(_values.select_options);
}
this.set_value(_values["value"]);
}
});}).call(this);