From e2cb9b44e7b3ff685a839b061456b2e39a042fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Erpicum?= Date: Thu, 17 May 2012 09:26:25 +0000 Subject: [PATCH] resolve problems in opening windows for viewing or editing in projectmanager --- etemplate/js/nextmatch_action.js | 2 +- phpgwapi/js/jsapi/egw_open.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/etemplate/js/nextmatch_action.js b/etemplate/js/nextmatch_action.js index a1e4a747f5..66564fbe45 100644 --- a/etemplate/js/nextmatch_action.js +++ b/etemplate/js/nextmatch_action.js @@ -189,7 +189,7 @@ function nm_action(_action, _senders) console.log(params); var egw_open_id = _senders[0].id; if (typeof params[2] != 'undefined') egw_open_id = egw_open_id.split(':')[params[2]]; - egw_open(egw_open_id,params[1],params[0],params[3]); + egw_open(egw_open_id,params[1],params[0],params[3],target); break; case 'open_popup': diff --git a/phpgwapi/js/jsapi/egw_open.js b/phpgwapi/js/jsapi/egw_open.js index 67d5b15b3c..a24c0b2b1a 100644 --- a/phpgwapi/js/jsapi/egw_open.js +++ b/phpgwapi/js/jsapi/egw_open.js @@ -46,7 +46,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) { { if (typeof id_data != 'object') { - var app_id = id.split(':',2); + var app_id = id_data.split(':',2); app = app_id[0]; id = app_id[1]; } @@ -58,6 +58,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) { } else if (app != 'file') { + id = id_data; id_data = { 'id': id, 'app': app, 'extra': extra }; } var url;