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

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-04-29 09:22:45 -04:00
parent ea7e63188f 3244ff23f7
commit 773e9b5cbd
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -1348,13 +1348,15 @@ class Bpmn extends Handler
$oCriteria->add( \BpmnFlowPeer::FLO_POSITION, $iPosition, '>' ); $oCriteria->add( \BpmnFlowPeer::FLO_POSITION, $iPosition, '>' );
$oDataset = \BpmnFlowPeer::doSelectRS( $oCriteria ); $oDataset = \BpmnFlowPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); while ($oDataset->next()) {
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
$oCriteria2 = new Criteria('workflow'); $newPosition = ((int)$aRow['FLO_POSITION'])-1;
$oCriteria2->add( \BpmnFlowPeer::FLO_POSITION, $aRow['FLO_POSITION'] - 1); $oCriteriaTemp = new Criteria( 'workflow' );
BasePeer::doUpdate($oCriteria, $oCriteria2, $con); $oCriteriaTemp->add( \BpmnFlowPeer::FLO_UID, $aRow['FLO_UID'] );
$oDataset->next(); $oCriteria2 = new Criteria('workflow');
$oCriteria2->add(\BpmnFlowPeer::FLO_POSITION, $newPosition);
BasePeer::doUpdate($oCriteriaTemp, $oCriteria2, $con);
}
} catch (Exception $oException) { } catch (Exception $oException) {
throw $oException; throw $oException;
} }

6
workflow/engine/templates/cases/cases_ScreenDerivation.html
View File

@@ -68,8 +68,7 @@
</tr> </tr>
{else} {else}
<tr> <tr>
<td class="FormLabel" width="100"></td> <td class="FormFieldContent" colspan="2" style="text-align: center">{$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD}</td>
<td class="FormFieldContent">{$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD}</td>
</tr> </tr>
{/if} {/if}
{/if} {/if}
@@ -93,8 +92,7 @@
</tr> </tr>
{else} {else}
<tr> <tr>
<td class="FormLabel" width="100"></td> <td class="FormFieldContent" colspan="2" style="text-align: center">{$data.NEXT_TASK.USR_HIDDEN_FIELD}</td>
<td class="FormFieldContent">{$data.NEXT_TASK.USR_HIDDEN_FIELD}</td>
</tr> </tr>
{/if} {/if}
{/if} {/if}