### Eclipse Workspace Patch 1.0 #P mod_dialog Index: globals.js =================================================================== --- globals.js (revision 672) +++ globals.js (working copy) @@ -42,7 +42,7 @@ application.output('Marking form "' + formName + '" for cleanup', LOGGINGLEVEL.DEBUG); bluePrintStack.push(formName); } - + var terminator = (application.getApplicationType() == APPLICATION_TYPES.WEB_CLIENT ? new Continuation() : null); /** @@ -91,7 +91,7 @@ /** * @private * - * @param {String} _sFormName + * @param {String|RuntimeForm} _sFormName * @param {String} _sDlgType * @param {Array} _aArguments * @param {String} [_sIconStyle] @@ -99,17 +99,24 @@ * @return {String} */ function showDialog(_sFormName, _sDlgType, _aArguments, _sIconStyle) { + var _aArgs = Array.prototype.slice.call(_aArguments), _nWidthPadding = 22, i, dialogWindow; var _sUniqueName = _aArgs[8] || utils.stringReplace(application.getUUID().toString(), "-", ""); + if(_aArgs[0] instanceof RuntimeForm) _aArgs[0] = _aArgs[0].controller.getName() + if (_sDlgType == 'FIMD') { dialogWindow = application.createWindow("W_" + _sUniqueName, JSWindow.MODAL_DIALOG); dialogWindow.setLocation(_aArgs[1] | JSWindow.DEFAULT, _aArgs[2] || JSWindow.DEFAULT); if (_aArgs[5]) { dialogWindow.title = _aArgs[5]; } + else + { + dialogWindow.title = solutionModel.getForm(_aArgs[0]).titleText + } dialogWindow.resizable = (_aArgs[6] == null ? true : _aArgs[6]); dialogWindow.showTextToolbar(_aArgs[7] == null ? false : _aArgs[7]); forms[_aArgs[0]]['windowName'] = "W_" + _sUniqueName;