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

getting server supplied actions working, thought actions submitting the form do not yet work

Browse Source
This commit is contained in:
Ralf Becker 2011-09-14 14:25:09 +00:00
parent 859f83bf39
commit ad99ce981f
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_dataview_view_row.js
View File

@ -90,12 +90,13 @@ var et2_dataview_row = et2_dataview_container.extend(et2_dataview_IDataRow, {
var aom = this.dataProvider.getActionObjectManager(); var aom = this.dataProvider.getActionObjectManager();
if (aom) if (aom)
{ {
this.actionObject = aom.addObject("row" + this._idx, // this is rather hackisch, but I have no idea how to get action_links & row_id here otherwise
this.actionObject = aom.addObject(_data.content[aom.manager.row_id],
new et2_dataview_rowAOI(this.tr[0])); new et2_dataview_rowAOI(this.tr[0]));
// TODO: The action links should be inside the data and not inside // TODO: The action links should be inside the data and not inside
// the row classes... // the row classes...
this.actionObject.updateActionLinks(["view","edit"]); this.actionObject.updateActionLinks(aom.manager.action_links);
} }
// Reset the height // Reset the height

27
etemplate/js/et2_extension_nextmatch.js
View File

@ -104,7 +104,7 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
// Load the first data into the dataProvider // Load the first data into the dataProvider
if (this.options.settings.rows) if (this.options.settings.rows)
{ {
this.dataProvider.loadData({"rows": this.options.rows}); this.dataProvider.loadData({"rows": this.options.settings.rows});
} }
// Create the outer grid container // Create the outer grid container
@ -386,26 +386,11 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
if (_settings.actions) if (_settings.actions)
{ {
// Read the actions from the settings array // Read the actions from the settings array
// this.actionManager.updateActions(_settings.actions); this.actionManager.updateActions(_settings.actions);
this.actionManager.updateActions( this.actionManager.setDefaultExecute("javaScript:nm_action");
[ // this is rather hackisch, but I have no idea how to get the action_link & row_id to the actionObject of the row otherwise
{ this.actionManager.action_links = _settings.action_links;
"id": "view", this.actionManager.row_id = _settings.row_id;
"iconUrl": "imgs/view.png",
"caption": "View",
"allowOnMultiple": false,
"type": "popup",
"default": true
},
{
"id": "edit",
"iconUrl": "imgs/edit.png",
"caption": "Edit file",
"allowOnMultiple": false,
"type": "popup"
}
]
);
} }
}, },