fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in marcoAntonioNina/processmaker/BUG-12200 (pull request #715)

Browse Source 
BUG-12200 Inability to Scroll on iPAD query tab IMPROVEMENT
This commit is contained in:
Julio Cesar Laura Avendaño
2014-08-26 15:34:59 -04:00
parent 4f6e43943c 85c039652c
commit 0d6ad6b205
2 changed files with 104 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/methods/cases/summary.php
View File

@@ -50,7 +50,11 @@ try {
$respView = $case->getAllObjectsFrom( $applicationFields['PRO_UID'], $_REQUEST['APP_UID'], $applicationFields['TAS_UID'], $_SESSION['USER_LOGGED'], 'VIEW' );
if ($respView['SUMMARY_FORM'] == 0) {
throw new Exception( G::LoadTranslation( 'ID_SUMMARY_FORM_NO_PERMISSIONS' ) );
global $G_PUBLISH;
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_SUMMARY_FORM_NO_PERMISSIONS' )) );
G::RenderPage( 'publish', 'blank' );
die();
}
if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) {
@@ -81,3 +85,13 @@ try {
die();
}
?>
<script type="text/javascript">
leimnud.event.add(window,"load",function(){
if (parent.document.getElementById('buttonOpenDynaform') != null) {
parent.document.getElementById('buttonOpenDynaform').setAttribute('class', 'x-btn x-btn-noicon')
parent.document.getElementById('buttonOpenDynaform').style = "width: auto;";
}
});
</script>
<?php

96
workflow/engine/templates/app/main.js
View File

@@ -497,15 +497,97 @@ var openSummaryWindow = function(appUid, delIndex, action)
});
var tabs = new Array();
var isMovil = {
Android: function() {
return navigator.userAgent.match(/Android/i);
},
BlackBerry: function() {
return navigator.userAgent.match(/BlackBerry/i);
},
iOS: function() {
return navigator.userAgent.match(/iPhone|iPad|iPod/i);
},
Opera: function() {
return navigator.userAgent.match(/Opera Mini/i);
},
Windows: function() {
return navigator.userAgent.match(/IEMobile/i);
},
other: function() {
return navigator.userAgent.match(/Mobile/i);
},
any: function() {
return isMovil.Android() || isMovil.BlackBerry() || isMovil.iOS() || isMovil.Opera() || isMovil.Windows() || isMovil.other();
}
};
tabs.push(sumaryInfPanel);
if (response.dynUid != '') {
tabs.push({title: Ext.util.Format.capitalize(_('ID_MORE_INFORMATION')), bodyCfg: {
tag: 'iframe',
id: 'summaryIFrame',
src: '../cases/summary?APP_UID=' + appUid + '&DEL_INDEX=' + delIndex + '&DYN_UID=' + response.dynUid,
style: {border: '0px none', height: '300px'},
onload: ''
}});
if (isMovil.any()) {
var src = '../cases/summary?APP_UID=' + appUid + '&DEL_INDEX=' + delIndex + '&DYN_UID=' + response.dynUid;
var windowOpen = function() {
window.open(src,'_blank');
};
var openDynaform = new Ext.Action({
text: _('ID_OPEN_DYNAFORM_TAB'),
id: 'buttonOpenDynaform',
handler: windowOpen
});
var fieldsAS = new Ext.form.FieldSet({
bodyStyle:'align:center',
items: [
{
xtype:'button',
id: 'buttonOpenDynaform',
name: 'buttonOpenDynaform',
hidden: true,
text: _('ID_OPEN_DYNAFORM_TAB'),
handler:function() {
window.open(src,'_blank');
}
},
{
html:'<iframe src="'+ src +'" width="100%" height="350" frameBorder="0"></iframe>'
}
]
});
var panel = new Ext.FormPanel({
labelAlign:'center',
autoScroll: true,
fileUpload: true,
width:'100%',
height: '50px',
bodyStyle:'padding:10px',
waitMsgTarget : true,
frame: true,
defaults: {
anchor: '100%',
allowBlank: false,
resizable: true,
msgTarget: 'side',
align:'center'
},
items:[
fieldsAS
]
});
tabs.push({
title: Ext.util.Format.capitalize(_('ID_MORE_INFORMATION')),
layout: 'fit',
items: [panel]
});
} else {
tabs.push({title: Ext.util.Format.capitalize(_('ID_MORE_INFORMATION')), bodyCfg: {
tag: 'iframe',
id: 'summaryIFrame',
src: '../cases/summary?APP_UID=' + appUid + '&DEL_INDEX=' + delIndex + '&DYN_UID=' + response.dynUid,
style: {border: '0px none', height: '300px', overflow: 'auto'},
onload: ''
}});
}
}
tabs.push({title: Ext.util.Format.capitalize(_('ID_UPLOADED_DOCUMENTS')), bodyCfg: {
tag: 'iframe',