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

Merged in cochalo/processmaker/PM-2293 (pull request #1932)

Browse Source 
PM-2293 PM-2296: Se agrego validacion para guardar una tarea
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-16 08:39:51 -04:00
parent f85e8323ce 1c1cd078f0
commit b2b421f039
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,7 +384,7 @@ class Task
$result = $task->update($arrayProperty); $result = $task->update($arrayProperty);
if (!empty($arrayProperty['CONSOLIDATE_DATA'])) { if (!empty($arrayProperty['CONSOLIDATE_DATA'])) {
if (isset($arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'])) { if (!empty($arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'])) {
G::LoadClass("consolidatedCases"); G::LoadClass("consolidatedCases");
$consolidated = new \ConsolidatedCases(); $consolidated = new \ConsolidatedCases();
$dataConso = array( $dataConso = array(

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

@@ -118,12 +118,12 @@ 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=')) {
if (isset($request_data['properties']['_features'])) { if (isset($request_data['properties']['_features']) && !empty($request_data['properties']['_features']['ActionsByEmail']['fields']['ABE_UID'])) {
$actionsByEmailService = new \ProcessMaker\BusinessModel\ActionsByEmail(); $actionsByEmailService = new \ProcessMaker\BusinessModel\ActionsByEmail();
$actionsByEmailService->saveConfiguration($request_data['properties']['_features']); $actionsByEmailService->saveConfiguration($request_data['properties']['_features']);
} }