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

- 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

View File

@@ -86,14 +86,14 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field
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",
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 : "760",
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",
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",
@@ -101,7 +101,6 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field
oninit: function (){
tinyMCE.activeEditor.processID = formProcessID;
tinyMCE.activeEditor.domainURL = domainURL;
},
onchange_callback: function(inst) {
if(inst.isDirty()) {
@@ -229,3 +228,4 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field
return $editorDefinition;
}
}

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':

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"/>
@@ -81,10 +81,11 @@ function editFile(pro_uid, fileName){
oPanel = new leimnud.module.panel();
oPanel.options={
limit: true,
size : {w:800,h:530},
size: {w: 820, h: 500},
position: {x: 50, y: 50, center: true},
title : '',
title: "",
control: {close: true, resize: false},
statusBar: true,
fx: {shadow: true, modal: true}
};
oPanel.make();
@@ -180,3 +181,4 @@ function xReaload(){
]]></JS>
</dynaForm>