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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-03-24 16:40:11 -04:00
parent f6030e8ac7 f31773f698
commit 8952670600
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.processes.php
View File

@@ -1501,8 +1501,8 @@ class Processes
try {
$aInput = array ();
$oCriteria = new Criteria( 'workflow' );
$oCriteria->add( InputdocumentPeer::PRO_UID, $sProUid );
$oDataset = InputdocumentPeer::doSelectRS( $oCriteria );
$oCriteria->add( InputDocumentPeer::PRO_UID, $sProUid );
$oDataset = InputDocumentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
@@ -1597,8 +1597,8 @@ class Processes
try {
$aOutput = array ();
$oCriteria = new Criteria( 'workflow' );
$oCriteria->add( OutputdocumentPeer::PRO_UID, $sProUid );
$oDataset = OutputdocumentPeer::doSelectRS( $oCriteria );
$oCriteria->add( OutputDocumentPeer::PRO_UID, $sProUid );
$oDataset = OutputDocumentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
while ($aRow = $oDataset->getRow()) {

2
workflow/engine/src/BusinessModel/Cases.php
View File

@@ -511,6 +511,8 @@ class Cases
$ws = new \wsBase();
if ($variables) {
$variables = array_shift($variables);
} elseif ($variables == null) {
$variables = array(array());
}
$fields = $ws->newCaseImpersonate($processUid, $userUid, $variables, $taskUid);
$array = json_decode(json_encode($fields), true);

1
workflow/engine/src/Services/Api/ProcessMaker/Cases.php
View File

@@ -664,6 +664,7 @@ class Cases extends Api
* @param string $usr_uid {@from body} {@min 32}{@max 32}
* @param string $tas_uid {@from body} {@min 32}{@max 32}
* @param array $variables {@from body}
*
*/
public function doPostCaseImpersonate($pro_uid, $usr_uid, $tas_uid, $variables=null)
{

7
workflow/engine/src/Tests/BusinessModel/CasesTest.php
View File

@@ -228,7 +228,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase
*/
public function testUpdateReassignCase(array $aResponse)
{
$response = $this->oCases->updateReassignCase($aResponse['app_uid'], '00000000000000000000000000000001', null, '00000000000000000000000000000001', '23063198853206b666e2bd0085065170');
$response = $this->oCases->updateReassignCase($aResponse['app_uid'], '00000000000000000000000000000001', null, '00000000000000000000000000000001', '73005191052d56727901138030694610');
$this->assertTrue(empty($response));
}
@@ -263,7 +263,7 @@ class CasesTest extends \PHPUnit_Framework_TestCase
}
/**
* Test add Case impersonate to test route case
* Test add Case impersonate
*
* @covers \BusinessModel\Cases::addCaseImpersonate
*
@@ -271,9 +271,8 @@ class CasesTest extends \PHPUnit_Framework_TestCase
*/
public function testAddCaseImpersonate()
{
$response = $this->oCases->addCaseImpersonate('1265557095225ff5c688f46031700471', '23063198853206b666e2bd0085065170', '46941969352af5be2ab3f39001216717', array('name' => 'John', 'lastname' => 'Petersson'));
$response = $this->oCases->addCaseImpersonate('1265557095225ff5c688f46031700471', '73005191052d56727901138030694610', '46941969352af5be2ab3f39001216717', array(array('name' => 'John', 'lastname' => 'Petersson')));
$this->assertTrue(is_object($response));
}
}

6
workflow/engine/templates/pmTables/list.js
View File

@@ -449,7 +449,7 @@ EditPMTable = function(){
if (row.data.TYPE != 'CLASSIC') {
tableType = row.data.PRO_UID ? 'report' : 'table';
proParam = PRO_UID !== false ? '&PRO_UID='+PRO_UID : '';
location.href = 'pmTables/edit?id='+row.data.ADD_TAB_UID+'&tableType=' + tableType + proParam;
location.href = 'pmTables/edit?id='+row.data.ADD_TAB_UID+'&flagProcessmap='+flagProcessmap+'&tableType=' + tableType + proParam;
}
else { //edit old report table
location.href = 'reportTables/reportTables_Edit?REP_TAB_UID='+row.data.ADD_TAB_UID
@@ -498,6 +498,10 @@ DeletePMTable = function() {
Ext.Msg.alert( _('ID_ERROR'), resp.result.message);
}
});
editButton.disable();
deleteButton.disable();
exportButton.disable();
dataButton.disable();
}
}
);