diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js index 7ddc51a2a..00b71d7f1 100755 --- a/workflow/engine/templates/pmTables/list.js +++ b/workflow/engine/templates/pmTables/list.js @@ -610,6 +610,11 @@ ExportPMTable = function(){ PMTableData = function() { var row = Ext.getCmp('infoGrid').getSelectionModel().getSelected(); + if ((Ext.isIE8) ||(Ext.isIE7)){ + var url = 'pmTables/data?id='+row.get('ADD_TAB_UID')+'&type='+row.get('TYPE'); + PopupCenter(url, 's', 800, 410); + return false; + } //location.href = 'pmTables/data?id='+row.get('ADD_TAB_UID'); if (row.get('TYPE') != '') { PMExt.info(_('ID_INFO'), _('ID_DATA_LIST_NOT_AVAILABLE_FOR_OLDVER')); @@ -687,3 +692,8 @@ function updateTag(value) }); } + function PopupCenter(pageURL, title,w,h) { + var left = (Ext.getBody().getViewSize().width/3); + var top = (Ext.getBody().getViewSize().height/3); + var targetWin = window.open (pageURL, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left); + } diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml index 45b1b6031..55ad323b8 100755 --- a/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml +++ b/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml @@ -16,7 +16,7 @@ var currentPagedTable = @#PAGED_TABLE_ID; var outputdocsEditor; function outputdocsAdd(){ - popupWindow('@G::LoadTranslation(ID_OUTPUT_DOCUMENTS)', '@G::encryptlink(@#outputdocs_New)?PRO_UID=@%PRO_UID' , 600, 410); + popupWindow('@G::LoadTranslation(ID_OUTPUT_DOCUMENTS)', '@G::encryptlink(@#outputdocs_New)?PRO_UID=@%PRO_UID' , 600, 410); } function PopupCenter(pageURL, title,w,h) { @@ -28,8 +28,8 @@ var outputdocsEditor; } function outputdocsEdit( uid, typ ) { - - if( _BROWSER.name == 'msie' ) { + + if (( _BROWSER.name == 'msie' ) && ( _BROWSER.version < '9' )) { PopupCenter('../outputdocs/outputdocs_Edit?OUT_DOC_UID=' + uid, 's', 800, 410); return false; }