From 052a1e8d9f929537150cdaf3fa96f5a06d4a5154 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 8 Dec 2014 15:58:22 +0000 Subject: [PATCH] do NOT add default placeholder-action of "add", if there is no such action, stalls new apps using nextmatch by default --- etemplate/js/et2_extension_nextmatch_controller.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etemplate/js/et2_extension_nextmatch_controller.js b/etemplate/js/et2_extension_nextmatch_controller.js index a1248cf49a..94bddfc98a 100644 --- a/etemplate/js/et2_extension_nextmatch_controller.js +++ b/etemplate/js/et2_extension_nextmatch_controller.js @@ -318,7 +318,7 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider, true, self ).sendRequest(); - + },true); } if(this._actionLinks.indexOf(drop_action.id) < 0) @@ -372,7 +372,7 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider, this._init_links_dnd(this._actionManager); }, - + /** * Overwrites the inherited _destroyCallback function in order to be able * to free the "rowWidget". @@ -432,7 +432,8 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider, // No UID, so return a filtered list of actions that doesn't need a UID var links = []; try { - links = typeof this._widget.options.settings.placeholder_actions != 'undefined' ? this._widget.options.settings.placeholder_actions : ["add"]; + links = typeof this._widget.options.settings.placeholder_actions != 'undefined' ? + this._widget.options.settings.placeholder_actions : (this._widget.options.add ? ["add"] : []); } catch (e) { }