fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in cochalo/processmaker/PM-2282 (pull request #1914)

Browse Source 
PM-2282 PM-2267: Adicion de validaciones para Action by email
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-14 15:55:58 -04:00
parent c3b10a782e 2e9ff18407
commit 11d0b896c3
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -384,18 +384,20 @@ class Task
$result = $task->update($arrayProperty); $result = $task->update($arrayProperty);
if (!empty($arrayProperty['CONSOLIDATE_DATA'])) { if (!empty($arrayProperty['CONSOLIDATE_DATA'])) {
G::LoadClass("consolidatedCases"); if (isset($arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'])) {
$consolidated = new \ConsolidatedCases(); G::LoadClass("consolidatedCases");
$dataConso = array( $consolidated = new \ConsolidatedCases();
'con_status' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_enable'], $dataConso = array(
'tas_uid' => $arrayProperty['TAS_UID'], 'con_status' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_enable'],
'dyn_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'], 'tas_uid' => $arrayProperty['TAS_UID'],
'pro_uid' => $arrayProperty['PRO_UID'], 'dyn_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'],
'rep_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_report_table'], 'pro_uid' => $arrayProperty['PRO_UID'],
'table_name' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_table'], 'rep_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_report_table'],
'title' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_title'] 'table_name' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_table'],
); 'title' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_title']
$consolidated->saveConsolidated($dataConso); );
$consolidated->saveConsolidated($dataConso);
}
} }
$arrayResult["status"] = "OK"; $arrayResult["status"] = "OK";

10
workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
View File

@@ -119,14 +119,16 @@ class Activity extends Api
$task = new \ProcessMaker\BusinessModel\Task(); $task = new \ProcessMaker\BusinessModel\Task();
$properties = $task->updateProperties($prj_uid, $act_uid, $request_data); $properties = $task->updateProperties($prj_uid, $act_uid, $request_data);
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
if (\PMLicensedFeatures if (\PMLicensedFeatures
::getSingleton() ::getSingleton()
->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) { ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
$actionsByEmailService = new \ProcessMaker\BusinessModel\ActionsByEmail(); if (isset($request_data['properties']['_features'])) {
$actionsByEmailService->saveConfiguration($request_data['properties']['_features']); $actionsByEmailService = new \ProcessMaker\BusinessModel\ActionsByEmail();
$actionsByEmailService->saveConfiguration($request_data['properties']['_features']);
}
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
} catch (\Exception $e) { } catch (\Exception $e) {
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
} }