fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
jonathan quispe
2015-03-06 12:34:23 -04:00
parent c023022db5 67f6264e84
commit eee0b183a7
4 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -684,7 +684,7 @@ function migrate_new_cases_lists($command, $args) {
}
if ($changes) {
if ($checkOnly) {
echo "-> Schema fixed\n";
echo "-> List tables are done\n";
}
} else {
echo "> List tables are done\n";

2
workflow/engine/classes/class.pmDynaform.php
View File

@@ -114,7 +114,7 @@ class pmDynaform
if ($json->dbConnection !== "none" && $json->sql !== "") {
$cnn = Propel::getConnection($json->dbConnection);
$stmt = $cnn->createStatement();
$rs = $stmt->executeQuery(\G::replaceDataField($json->sql, array()), \ResultSet::FETCHMODE_NUM);
$rs = $stmt->executeQuery(strtoupper($json->sql), \ResultSet::FETCHMODE_NUM);
while ($rs->next()) {
$row = $rs->getRow();
$option = array(

4
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -487,9 +487,9 @@ class Variable
$row = $rsCriteria->getRow();
$variableDbConnectionUid = $row["VAR_DBCONNECTION"];
$variableSql = $row["VAR_SQL"];
$variableSql = strtoupper($row["VAR_SQL"]);
} else {
throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array(strtolower("VAR_NAME"), $variableName)));
throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array("VAR_NAME", $variableName)));
}
//Verify data

33
workflow/engine/templates/designer/index.html
View File

@@ -78,49 +78,32 @@
<body onresize="resizingFrame();">
{$stringBpmn}
<div class="ui-layout-north">
<!--<div class="ui-layout-north">-->
<section class="navBar" id="idNavBar">
<div class="head"></div>
<nav>
<ul>
<li><a href="#" ><span class="mafe-button-close" ></span></a></li>
<li><a href="#" ><span class="mafe-button-close" ></span></a></li>
<li><a href="#" class="mafe-button-save"></a></li>
<li><a href="#" class="mafe-button-export-process"></a></li>
<li><a class="mafe-button-export-bpmn-process"></a></li>
<li><a href="#" class="mafe-button-undo"></a> <a href="#" class="mafe-button-redo"></a></li>
<li></li>
<li><a href="#" title="" class="mafe-button-fullscreen"></a></li>
<li><a href="#" title="" class="mafe-button-fullscreen"></a></li>
</ul>
</nav>
</section>
</div>
<!--</div>-->
<div id="p-center-layout">
<div id="p-center-layout"/>
<!--BODY-->
<div class="ui-layout-center tab-content" id="div-layout-canvas">
<!--TODO INSERT DIV CANVAS-->
</div>
<div class="ui-layout-east" id="div-layout-properties">
<div class="ui-layout-center">
<div id="diagram-treecontainer"></div>
</div>
<div class="ui-layout-south">
<div style="font-size: 11px;" id="diagram-property-grid"> </div>
</div>
</div>
<!--END BODY-->
</div>
<div class="ui-layout-west">
</div>
<div class="bpmn_shapes">
<!--<div class="head"></div>-->
</div>
</div>
@@ -130,8 +113,8 @@
<div class="content_controls">
<div class="head"></div>
<ul>
<li>
<a href="#" class="mafe-menu-variable"></a>
<li>
<a href="#" class="mafe-menu-variable"></a>
<a href="#" class="btn_create mafe-menu-variable-create"><span></span></a>
</li>
<!--<li>