fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 10447 "we are not able to get grid details through mail" SOLVED

Browse Source 
- Problem at adding grid in template
- Added option grid in wizard
- Solved problem of notice in attribute of the object
* Available from version ProcessMaker-2.0.46
This commit is contained in:
Victor Saisa Lopez
2013-02-04 16:34:56 -04:00
parent 13873dd2ed
commit 7a1234acce
3 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gulliver/system/class.wysiwygEditor.php
View File

@@ -85,23 +85,22 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field
var actualCaretPositionBookmark;
var formProcessID = document.getElementById("form[pro_uid]").value;
tinyMCE.init({
theme : "advanced",
plugins : "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,style",
mode : "specific_textareas",
editor_selector : "tmceEditor",
width : "760",
height : "'.$this->height.'",
theme: "advanced",
plugins: "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,pmGrids,style",
mode: "specific_textareas",
editor_selector: "tmceEditor",
width: "770",
height: "' . $this->height . '",
directionality: "' . ($serverConf->isRtl(SYS_LANG) ? 'rtl' : 'ltr') . '",
theme_advanced_buttons1 : "pmSimpleUploader,|,pmVariablePicker,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote",
theme_advanced_buttons2 : "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code",
verify_html: false,
theme_advanced_buttons1: "pmSimpleUploader,|,pmVariablePicker,|,pmGrids,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote",
theme_advanced_buttons2: "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code",
popup_css : "/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css",
skin : "o2k7",
skin_variant : "silver",
oninit: function (){
tinyMCE.activeEditor.processID = formProcessID;
tinyMCE.activeEditor.domainURL = domainURL;
},
onchange_callback: function(inst) {
if(inst.isDirty()) {
@@ -123,16 +122,16 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field
// is necessary the process uid variable in order to load the picker correctly
var formProcessID = document.getElementById("form[PRO_UID]").value;
tinyMCE.init({
theme : "advanced",
plugins : "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,pmGrids,style",
mode : "specific_textareas",
editor_selector : "tmceEditor",
width : "770",
height : "305",
theme: "advanced",
plugins: "advhr,advimage,advlink,advlist,autolink,autoresize,contextmenu,directionality,emotions,example,example_dependency,fullpage,fullscreen,iespell,inlinepopups,insertdatetime,layer,legacyoutput,lists,media,nonbreaking,noneditable,pagebreak,paste,preview,print,save,searchreplace,style,tabfocus,table,template,visualblocks,visualchars,wordcount,xhtmlxtras,pmSimpleUploader,pmVariablePicker,pmGrids,style",
mode: "specific_textareas",
editor_selector: "tmceEditor",
width: "770",
height: "305",
directionality: "' . ($serverConf->isRtl(SYS_LANG) ? 'rtl' : 'ltr') . '",
verify_html : false,
theme_advanced_buttons1 : "pmSimpleUploader,|,pmVariablePicker,|,pmGrids,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote",
theme_advanced_buttons2 : "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code",
verify_html: false,
theme_advanced_buttons1: "pmSimpleUploader,|,pmVariablePicker,|,pmGrids,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect,|,cut,copy,paste,|,bullist,numlist,|,outdent,indent,blockquote",
theme_advanced_buttons2: "tablecontrols,|,undo,redo,|,link,unlink,image,|,forecolor,backcolor,styleprops,|,hr,removeformat,visualaid,|,sub,sup,|,ltr,rtl,|,code",
popup_css : "/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css",
skin : "o2k7",
skin_variant : "silver",
@@ -229,3 +228,4 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field
return $editorDefinition;
}
}

3
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -319,8 +319,7 @@ try {
$oProcessMap->processFilesManager( $oData->pro_uid );
break;
case 'exploreDirectory':
$objData = Bootstrap::json_decode( $_REQUEST['data'] );
$_SESSION['PFMDirectory'] = $objData->{'main_directory'};
$_SESSION["PFMDirectory"] = $oData->main_directory;
$oProcessMap->exploreDirectory( $oData->pro_uid, $oData->main_directory, $oData->directory );
break;
case 'deleteFile':

50
workflow/engine/xmlform/processes/processes_FilesOptions.xml
View File

@@ -6,7 +6,7 @@
</MNU_NEWEMPTY>
<MNU_UPLOAD type="link" value="" link="#" onclick="uploadFilesScreen(@QPRO_UID, @QMAIN_DIRECTORY, @QCURRENT_DIRECTORY);return false;" colAlign="left" colWidth="100">
<en>Upload...............</en>
<en>Upload</en>
</MNU_UPLOAD>
<PRO_UID type="private"/>
@@ -24,20 +24,20 @@ var oUploadFilesPanel;
var oUploadFilesPanel;
var uploadFilesScreen = function(PRO_UID, MAIN_DIRECTORY, CURRENT_DIRECTORY) {
var swNavigator;
var swNavigator;
if(navigator.appName=='Microsoft Internet Explorer'){
var rv = '';
if (new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})").exec(navigator.userAgent) != null) {
rv = parseFloat(RegExp.$1);
rv = parseFloat(RegExp.$1);
}
if (rv >= 9) {
swNavigator='ie9+';
swNavigator='ie9+';
}
else {
else {
swNavigator='ie';
}
wd = 420;
hg = 170;
} else {
@@ -48,11 +48,11 @@ var uploadFilesScreen = function(PRO_UID, MAIN_DIRECTORY, CURRENT_DIRECTORY) {
CURRENT_MAIN_DIRECTORY = MAIN_DIRECTORY;
CURRENT_CURRENT_DIRECTORY = CURRENT_DIRECTORY;
Pm.tmp.processFilesManagerPanel.events = {
remove: function() { oUploadFilesPanel.remove(); }.extend(this)
};
oUploadFilesPanel = new leimnud.module.panel();
oUploadFilesPanel.options={
limit : true,
@@ -76,19 +76,20 @@ function editFile(pro_uid, fileName){
var typofile = fileName.split(".");
if( typofile[typofile.length-1].toLowerCase() != 'txt' && typofile[typofile.length-1].toLowerCase() != 'html' ){
msgBox(G_STRINGS.HTML_FILES,"alert");return;
}
}
oPanel = new leimnud.module.panel();
oPanel.options={
limit : true,
size : {w:800,h:530},
position : {x:50,y:50,center:true},
title : '',
control : {close:true,resize:false},
fx : {shadow:true,modal:true}
limit: true,
size: {w: 820, h: 500},
position: {x: 50, y: 50, center: true},
title: "",
control: {close: true, resize: false},
statusBar: true,
fx: {shadow: true, modal: true}
};
oPanel.make();
var oRPC = new leimnud.module.rpc.xmlhttp({
url : 'processes_Ajax',
args: 'action=editFile&filename='+fileName+'&pro_uid='+pro_uid
@@ -107,17 +108,17 @@ function editFile(pro_uid, fileName){
/*refresh content tiny*/
function saveFile(pro_uid, fileName){
var fc64 = base64_encode(getField('fcontent').value);
tinyMCE.execCommand('mceRemoveControl',false,'form[fcontent]');
fc64 = fc64.replace(/&amp;/g, "@amp@");
fc64 = fc64.replace(/\+/g, '%2B');
var oRPC = new leimnud.module.rpc.xmlhttp({
url : 'processes_Ajax',
args: 'action=saveFile&filename='+fileName+'&pro_uid='+pro_uid+'&MAIN_DIRECTORY='+CURRENT_MAIN_DIRECTORY+'&fcontent='+fc64
});
oPanel.loader.show();
oRPC.callback = function(rpc) {
oPanel.remove();
@@ -153,12 +154,12 @@ function showCreateEmptyOptions(e, MAIN_DIRECTORY){
function saveEmptyFile(){
var fileName = getField('emptyfilename').value + ".html";
fileName = fileName.trim();
var oRPC = new leimnud.module.rpc.xmlhttp({
url : 'processes_Ajax',
args: 'action=saveFile&filename='+fileName+'&pro_uid='+CURRENT_PRO_UID+'&MAIN_DIRECTORY='+CURRENT_MAIN_DIRECTORY+'&fcontent='
});
oRPC.callback = function(rpc){
showCreateEmptyOptionsPanel.remove();
/// goToDirectory(CURRENT_PRO_UID, 'mailTemplates', '');
@@ -172,11 +173,12 @@ function saveEmptyFile(){
oRPC.make();
}
function xReaload(){
function xReaload(){
goToDirectory(CURRENT_PRO_UID, CURRENT_MAIN_DIRECTORY, CURRENT_CURRENT_DIRECTORY);
}
]]></JS>
</dynaForm>
</dynaForm>