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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-04-25 11:47:52 -04:00
parent e4e210aa36 76e427f0b2
commit bec54b1f19
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.dynaformEditor.php
View File

@@ -209,7 +209,9 @@ class dynaformEditor extends WebResource
$G_PUBLISH->AddContent('blank');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PREVIEW"), $sName . '[3]', 'dynaformEditor.changeToPreview', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_XML"), $sName . '[4]', 'dynaformEditor.changeToXmlCode', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_HTML"), $sName . '[5]', 'dynaformEditor.changeToHtmlCode', 'dynaformEditor.saveCurrentView');
if ($Properties['DYN_TYPE'] != 'grid') {
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_HTML"), $sName . '[5]', 'dynaformEditor.changeToHtmlCode', 'dynaformEditor.saveCurrentView');
}
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_FIELDS_LIST"), $sName . '[6]', 'dynaformEditor.changeToFieldsList', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_JAVASCRIPTS"), $sName . '[7]', 'dynaformEditor.changeToJavascripts', 'dynaformEditor.saveCurrentView');
$G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PROPERTIES"), $sName . '[8]', 'dynaformEditor.changeToProperties', 'dynaformEditor.saveCurrentView');
@@ -227,7 +229,7 @@ class dynaformEditor extends WebResource
//Javascript codemirror 3.13
$oHeadPublisher->addScriptFile('/js/codemirror/addon/edit/closebrackets.js', 1);
$oHeadPublisher->addScriptFile('/js/codemirror/mode/javascript/javascript.js', 1);
$oHeadPublisher->addScriptFile('/js/grid/core/grid.js');
$oHeadPublisher->addScriptCode('
var DYNAFORM_URL="' . $Parameters['URL'] . '";

2
workflow/engine/classes/model/Step.php
View File

@@ -365,7 +365,7 @@ class Step extends BaseStep
$aRow = $oDataset->getRow();
if ($aRow['DYN_TYPE'] != 'xmlform') {
$check = 0;
$oC1 = new Criteria( 'workflow' );
$oC1->add( DynaformPeer::PRO_UID, $sproUid );
$oC1->add( DynaformPeer::DYN_TYPE, "xmlform" );