mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-21 18:31:37 +02:00
Get updates to sel-options in row results working
This commit is contained in:
parent
8049c3d7f5
commit
cdbe049f21
@ -550,7 +550,7 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
|
|||||||
null,
|
null,
|
||||||
this.egw(),
|
this.egw(),
|
||||||
this.getInstanceManager().etemplate_exec_id,
|
this.getInstanceManager().etemplate_exec_id,
|
||||||
"nm",
|
this,
|
||||||
null,
|
null,
|
||||||
this.dataview.grid,
|
this.dataview.grid,
|
||||||
this.rowProvider,
|
this.rowProvider,
|
||||||
|
@ -34,8 +34,7 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(
|
|||||||
* @param _parentController is the parent nextmatch controller instance
|
* @param _parentController is the parent nextmatch controller instance
|
||||||
* @param _egw is the api instance
|
* @param _egw is the api instance
|
||||||
* @param _execId is the execId of the etemplate
|
* @param _execId is the execId of the etemplate
|
||||||
* @param _widgetId is the id of the nextmatch-widget we are fetching data
|
* @param _widget is the nextmatch-widget we are fetching data for.
|
||||||
* for.
|
|
||||||
* @param _grid is the grid the grid controller will be controlling
|
* @param _grid is the grid the grid controller will be controlling
|
||||||
* @param _rowProvider is the nextmatch row provider instance.
|
* @param _rowProvider is the nextmatch row provider instance.
|
||||||
* @param _objectManager is the parent object manager (if null, the object
|
* @param _objectManager is the parent object manager (if null, the object
|
||||||
@ -44,7 +43,7 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(
|
|||||||
* @param _actions contains the actions, may be null if an object manager
|
* @param _actions contains the actions, may be null if an object manager
|
||||||
* is given.
|
* is given.
|
||||||
*/
|
*/
|
||||||
init: function (_parentController, _egw, _execId, _widgetId, _parentId,
|
init: function (_parentController, _egw, _execId, _widget, _parentId,
|
||||||
_grid, _rowProvider, _actionLinks, _objectManager, _actions) {
|
_grid, _rowProvider, _actionLinks, _objectManager, _actions) {
|
||||||
|
|
||||||
// Copy the egw reference
|
// Copy the egw reference
|
||||||
@ -65,10 +64,13 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(
|
|||||||
this._super(_parentController, _grid, this, this._rowCallback,
|
this._super(_parentController, _grid, this, this._rowCallback,
|
||||||
this._linkCallback, this, this._objectManager);
|
this._linkCallback, this, this._objectManager);
|
||||||
|
|
||||||
|
// Keep a reference to the widget
|
||||||
|
this._widget = _widget;
|
||||||
|
|
||||||
// Copy the given parameters
|
// Copy the given parameters
|
||||||
this._actionLinks = _actionLinks
|
this._actionLinks = _actionLinks
|
||||||
this._execId = _execId;
|
this._execId = _execId;
|
||||||
this._widgetId = _widgetId;
|
this._widgetId = _widget.id;
|
||||||
this._parentId = _parentId;
|
this._parentId = _parentId;
|
||||||
this._rowProvider = _rowProvider;
|
this._rowProvider = _rowProvider;
|
||||||
|
|
||||||
@ -181,6 +183,43 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(
|
|||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overridden from the parent to also process any additional data that
|
||||||
|
* the data source adds, such as readonlys and additonal content.
|
||||||
|
* For example, non-numeric IDs in rows are added to the content manager
|
||||||
|
*/
|
||||||
|
_fetchCallback: function (_response) {
|
||||||
|
var nm = this.self._widget;
|
||||||
|
|
||||||
|
// Readonlys
|
||||||
|
// Other stuff
|
||||||
|
for(var i in _response.rows)
|
||||||
|
{
|
||||||
|
if(jQuery.isNumeric(i)) continue;
|
||||||
|
if(i == 'sel_options')
|
||||||
|
{
|
||||||
|
var mgr = nm.getArrayMgr(i);
|
||||||
|
for(var id in _response.rows.sel_options)
|
||||||
|
{
|
||||||
|
mgr.data[id] = _response.rows.sel_options[id];
|
||||||
|
var select = nm.getWidgetById(id);
|
||||||
|
if(select)
|
||||||
|
{
|
||||||
|
select.set_select_options(_response.rows.sel_options[id]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var mgr = nm.getArrayMgr('content');
|
||||||
|
mgr.data[i] = _response.rows[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call the inherited function
|
||||||
|
this._super.apply(this, arguments);
|
||||||
|
},
|
||||||
|
|
||||||
/** -- Implementation of et2_IDataProvider -- **/
|
/** -- Implementation of et2_IDataProvider -- **/
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user