fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
jennylee
2014-06-05 16:48:38 -04:00
parent dbc3504737 2032b9da3f
commit 1e18293e3c
6 changed files with 115 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/js/dynaformEditor/core/dynaformEditor.js
View File

@@ -13,7 +13,7 @@ var lastTypeSelected = '';
var sessionPersits = function() {
var rpc = new leimnud.module.rpc.xmlhttp({
url: '../services/sessionPersists',
args: 'dynaformEditorParams=' + dynaformEditorParams + (lastActionPerformed != '' ? '&DYN_UID=' + __DYN_UID__ : ''),
args: "dynaformEditorParams=" + encodeURIComponent(dynaformEditorParams) + ((lastActionPerformed != "")? "&DYN_UID=" + __DYN_UID__ : ""),
async: false
});
rpc.make();

3
workflow/engine/methods/services/sessionPersists.php
View File

@@ -2,7 +2,8 @@
$response = new stdclass();
$response->status = isset($_SESSION['USER_LOGGED']);
if (isset($_REQUEST['dynaformEditorParams'])) {
$_SESSION['Current_Dynafom']['Parameters'] = unserialize(stripslashes($_REQUEST['dynaformEditorParams']));
$_SESSION['Current_Dynafom']['Parameters'] = unserialize(stripslashes(utf8_decode(rawurldecode($_REQUEST["dynaformEditorParams"]))));
if (isset($_REQUEST['DYN_UID'])) {
if (class_exists('Dynaform')) {
require_once 'classes/model/Dynaform.php';

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

@@ -476,7 +476,7 @@ var openSummaryWindow = function(appUid, delIndex, action)
title: _('ID_SUMMARY'),
layout: 'fit',
width: 750,
height: 450,
height: 500,
resizable: true,
closable: true,
modal: true,

6
workflow/engine/templates/cases/casesDocuments.js
View File

@@ -1383,6 +1383,12 @@ function handleRowClick(sm, rowIndex) {//alert(rowIndex);
tb.items.get('tb_download').hide();
//tb.items.get('tb_download').disable();
} else if (selections.length == 1) {
if (selections[0].get('type') == "Directory") {
itemSelected = selections[0].get('id');
chDir( selections[0].get('id'));
itemSelected = "";
return true;
}
//tb.items.get('tb_delete')[selections[0].get('is_deletable') ? 'enable': 'disable']();
tb.items.get('tb_delete')[permitodelete==1 ? 'enable': 'disable']();
tb.items.get('tb_rename')[selections[0].get('is_deletable') ? 'disable': 'disable']();

127
workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
View File

@@ -1,50 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="dynaforms_Properties" type="xmlform" width="450" height="auto">
<!--height="450"-->
<PME_PROPERTIES_TITLE type="title">
<en><![CDATA[Properties]]></en>
</PME_PROPERTIES_TITLE>
<DYN_UID type="hidden" showInTable="0"/>
<PRO_UID type="hidden" showInTable="0"/>
<DYN_TYPE_PREVIOUS type="hidden" showInTable="0"/>
<A type="hidden" showInTable="0"/>
<DYN_TITLE type="text" maxlength="32" size="32">
<en><![CDATA[Dynaform]]></en>
</DYN_TITLE>
<DYN_TYPE type="dropdown" colWidth="80" align="center">
<en><![CDATA[Type]]><option name="xmlform"><![CDATA[Master Form]]></option><option name="grid"><![CDATA[Grid]]></option></en>
</DYN_TYPE>
<DYN_DESCRIPTION type="textarea" cols="32" rows="12">
<en><![CDATA[Description]]></en>
</DYN_DESCRIPTION>
<SUBTITLE type="subtitle" enableHTML="1">
<en><![CDATA[Others]]></en>
</SUBTITLE>
<WIDTH type="text" maxlength="10" size="15">
<en><![CDATA[Width]]></en>
</WIDTH>
<MODE type="dropdown" colWidth="80" align="center" defaultvalue="edit">
<en><![CDATA[Mode]]><option name=""><![CDATA[Determined by Fields]]></option><option name="edit"><![CDATA[All Edit]]></option><option name="view"><![CDATA[All View]]></option></en>
</MODE>
<NEXTSTEPSAVE type="dropdown" colWidth="80" align="center">
<en><![CDATA[Next Step Link]]><option name=""><![CDATA[No save & Continue]]></option><option name="save"><![CDATA[Save & Continue]]></option><option name="prompt"><![CDATA[Show prompt]]></option></en>
</NEXTSTEPSAVE>
<PRINTDYNAFORM type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
<en><![CDATA[Show print dynaform button]]></en>
</PRINTDYNAFORM>
<ADJUSTGRIDSWIDTH type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
<en><![CDATA[Adjust the grid width to the width of the main form]]></en>
</ADJUSTGRIDSWIDTH>
<!--<ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0">
<dynaForm
name="dynaforms_Properties"
type="xmlform"
width="450"
height="auto"
>
<!--height="450"-->
<PME_PROPERTIES_TITLE type="title">
<en>Properties</en>
</PME_PROPERTIES_TITLE>
<DYN_UID type="hidden" showInTable="0"/>
<PRO_UID type="hidden" showInTable="0"/>
<DYN_TYPE_PREVIOUS type="hidden" showInTable="0"/>
<A type="hidden" showInTable="0"/>
<DYN_TITLE type="text" maxlength="256" size ="32">
<en>Dynaform</en>
</DYN_TITLE>
<DYN_TYPE type="dropdown" colWidth="80" align="center">
<en>Type
<option name="xmlform">Master Form</option>
<option name="grid">Grid</option>
</en>
</DYN_TYPE>
<DYN_DESCRIPTION type="textarea" cols="32" rows="12">
<en>Description</en>
</DYN_DESCRIPTION>
<SUBTITLE type="subtitle" enableHTML="1">
<en>Others</en>
</SUBTITLE>
<WIDTH type="text" maxlength="10" size ="15">
<en>Width</en>
</WIDTH>
<MODE type="dropdown" colWidth="80" align="center" defaultvalue="edit">
<en>Mode
<option name="">Determined by Fields</option>
<option name="edit">All Edit</option>
<option name="view">All View</option>
</en>
</MODE>
<NEXTSTEPSAVE type="dropdown" colWidth="80" align="center">
<en>Next Step Link
<option name=""><![CDATA[No save & Continue]]></option>
<option name="save"><![CDATA[Save & Continue]]></option>
<option name="prompt">Show prompt</option>
</en>
</NEXTSTEPSAVE>
<PRINTDYNAFORM type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
<en>Show print dynaform button</en>
</PRINTDYNAFORM>
<ADJUSTGRIDSWIDTH type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
<en>Adjust the grid width to the width of the main form</en>
</ADJUSTGRIDSWIDTH>
<!--<ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0">
<en>Enable Template</en>
</ENABLETEMPLATE>-->
<PME_PROP_APPLY type="button" onclick="dynaformEditor.saveProperties();">
<en><![CDATA[Apply]]></en>
</PME_PROP_APPLY>
<PME_PROP_REVERT type="button" onclick="dynaformEditor.refreshProperties();">
<en><![CDATA[Revert]]></en>
</PME_PROP_REVERT>
<sdfsdf type="javascript"><![CDATA[
<PME_PROP_APPLY type="button" onclick="dynaformEditor.saveProperties();">
<en>Apply</en>
</PME_PROP_APPLY>
<PME_PROP_REVERT type="button" onclick="dynaformEditor.refreshProperties();">
<en>Revert</en>
</PME_PROP_REVERT>
<sdfsdf type="javascript">
<![CDATA[
// added by gustavo cruz gustavo-at-colosa.com
// function getElementsByClassNameCrossBrowser
// CrossBrowser implemetation of the getElementsByClassName firefox function
@@ -135,7 +165,7 @@ function validateGridConversion(proUid,dynUid){
msgBox("Grid forms can not contain the following fields: <br>" + response,"alert");
return false;
}
}.extend(this);
isTrue = oRPC.make();
@@ -163,7 +193,7 @@ function changeToolbar(type){
args : 'TOOLBAR=' + type + '&FILE=' + file + '&PRO_UID=' + proUid + '&DYN_UID=' + dynUid + '&DYN_TITLE=' + dynTitle
});
oRPC.callback = function(oRPC) {
getElementsByClassNameCrossBrowser("panel_headerBar___processmaker",document,"div")[0].innerHTML = oRPC.xmlhttp.responseText;
document.getElementById("publisherContent[0]").style.display = "inline";
document.getElementById("publisherContent[0]").style.position = "absolute";
@@ -191,5 +221,6 @@ orderButtons();
oAux.checked=this.checked;
}
}*/
]]></sdfsdf>
</dynaForm>
]]>
</sdfsdf>
</dynaForm>