fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 8226 "Report Tables in ProcessMaker 2.0.35 is not..." SOLVED

Browse Source 
- Report Tables in IE does not display correctly, transparent boxes appear
- Problem solved, now display reportTables in popup window when the browser is IE
This commit is contained in:
Victor Saisa Lopez
2012-07-30 16:28:08 -04:00
parent 9808608093
commit 7fce772674
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
workflow/engine/js/processmap/core/processmap.js
View File

@@ -23,9 +23,9 @@ var processmap=function(){
Wx = (lanzado=='dynaforms' || lanzado=='triggers' || lanzado=='outputs') ?600 : 500; Wx = (lanzado=='dynaforms' || lanzado=='triggers' || lanzado=='outputs') ?600 : 500;
Hx = 460; Hx = 460;
if(lanzado=='reportTables'){ if (lanzado == "reportTables") {
Wx = _client.width-20; //900; Wx = _client.width - 30;
Hx = _client.height-15; //600; Hx = _client.height - 15;
} }
var bbk = { var bbk = {
@@ -157,16 +157,32 @@ var processmap=function(){
r.make(); r.make();
}.extend(this), }.extend(this),
reportTables:function(){ reportTables:function(){
var url = "../pmTables?PRO_UID=" + this.options.uid;
var isIE = (navigator.userAgent.toLowerCase().indexOf("msie") != -1)? 1 : 0;
if (isIE == 1) {
this.panels.buildingBlocks.remove();
//var w = _client.width - 20;
//var h = _client.height - 300;
var w = screen.width - 150;
var h = screen.height - 300;
var windowAux = window.open(url, "reportTable", "width=" + w + ", height=" + h + ", resizable=no, toolbar=no, menubar=no, scrollbars=yes, status=no, location=no, left=" + ((screen.width / 2) - (w / 2)) + ", top=" + ((screen.height / 2) - (h / 2) + 50));
} else {
var panel = this.panels.buildingBlocks; var panel = this.panels.buildingBlocks;
panel.addContentTitle(''); panel.addContentTitle("");
panel.clearContent(); panel.clearContent();
var iframe=document.createElement('iframe');
iframe.setAttribute('id','reportTablesIframe'); var iframe = document.createElement("iframe");
iframe.src = '../pmTables?PRO_UID=' + this.options.uid; iframe.setAttribute("id", "reportTablesIframe");
iframe.style.border='0px'; iframe.src = url;
iframe.style.width=_client.width-36;//'886px'; iframe.frameBorder = 0;
iframe.style.height=_client.height-60;//'564px'; iframe.style.width = _client.width - 40;
iframe.style.height = _client.height - 70;
panel.addContent(iframe); panel.addContent(iframe);
}
}.extend(this), }.extend(this),
dynaforms:function(){ dynaforms:function(){
var panel = this.panels.buildingBlocks; var panel = this.panels.buildingBlocks;

13
workflow/engine/templates/pmTables/list.js
View File

@@ -613,11 +613,7 @@ PMTableData = function()
{ {
var row = Ext.getCmp('infoGrid').getSelectionModel().getSelected(); var row = Ext.getCmp('infoGrid').getSelectionModel().getSelected();
var type = row.get('PRO_UID'); var type = row.get('PRO_UID');
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'); //location.href = 'pmTables/data?id='+row.get('ADD_TAB_UID');
if (row.get('TYPE') != '') { if (row.get('TYPE') != '') {
PMExt.info(_('ID_INFO'), _('ID_DATA_LIST_NOT_AVAILABLE_FOR_OLDVER')); PMExt.info(_('ID_INFO'), _('ID_DATA_LIST_NOT_AVAILABLE_FOR_OLDVER'));
@@ -625,10 +621,10 @@ PMTableData = function()
} }
win = new Ext.Window({ win = new Ext.Window({
layout:'fit', layout: 'fit',
width:700, width: 700,
height: 400,
title: ((type != '')? _('ID_REPORT_TABLE') : _('ID_PMTABLE')) +': '+ row.get('ADD_TAB_NAME'), title: ((type != '')? _('ID_REPORT_TABLE') : _('ID_PMTABLE')) +': '+ row.get('ADD_TAB_NAME'),
height:500,
modal: true, modal: true,
maximizable: true, maximizable: true,
constrain: true, constrain: true,
@@ -645,6 +641,7 @@ PMTableData = function()
} }
} }
}); });
win.show(); win.show();
}; };