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

Merge pull request #2430 from Jennydmz/master

Browse Source 
BUG-15068 PMFPauseCase dosen`t pause the case whrn using the trigger wiz...
This commit is contained in:
julceslauhub
2014-05-29 17:07:09 -04:00
parent acb7b34880 342436d82f
commit dd5ebcb16e
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2843,8 +2843,9 @@ function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i
* *
* It delete the mask a field. * It delete the mask a field.
* *
* @name PMFAddAttachmentToArray * @name PMFRemoveMask
* * @label PMF Remove Mask
*
* @param string | $field | Value the field * @param string | $field | Value the field
* @param string | $separator | Separator of thousands (, or .) * @param string | $separator | Separator of thousands (, or .)
* @param string | $currency | symbol of currency * @param string | $currency | symbol of currency
@@ -2852,7 +2853,7 @@ function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i
* *
*/ */
function PMRemoveMask ($field, $separator = '.', $currency = '') function PMFRemoveMask ($field, $separator = '.', $currency = '')
{ {
$sep = array(); $sep = array();
if ( trim($currency) != '') { if ( trim($currency) != '') {

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

@@ -3079,7 +3079,6 @@ class wsBase
return $result; return $result;
} }
if (empty( $userUid )) { if (empty( $userUid )) {
$result = new wsResponse( 100, G::LoadTranslation( "ID_REQUIRED_FIELD" ) . " userUid" ); $result = new wsResponse( 100, G::LoadTranslation( "ID_REQUIRED_FIELD" ) . " userUid" );
@@ -3087,8 +3086,7 @@ class wsBase
return $result; return $result;
} }
if( strlen($unpauseDate) >=10 ){
if (! empty( $unpauseDate )) {
if (! preg_match( "/^\d{4}-\d{2}-\d{2}| \d{2}:\d{2}:\d{2}$/", $unpauseDate )) { if (! preg_match( "/^\d{4}-\d{2}-\d{2}| \d{2}:\d{2}:\d{2}$/", $unpauseDate )) {
$result = new wsResponse( 100, G::LoadTranslation( "ID_INVALID_DATA" ) . " $unpauseDate" ); $result = new wsResponse( 100, G::LoadTranslation( "ID_INVALID_DATA" ) . " $unpauseDate" );
@@ -3096,8 +3094,9 @@ class wsBase
return $result; return $result;
} }
} else {
$unpauseDate = null;
} }
$case = new Cases(); $case = new Cases();
$case->pauseCase( $caseUid, $delIndex, $userUid, $unpauseDate ); $case->pauseCase( $caseUid, $delIndex, $userUid, $unpauseDate );
@@ -3108,7 +3107,6 @@ class wsBase
); );
$g->sessionVarRestore(); $g->sessionVarRestore();
return $result; return $result;
} catch (Exception $e) { } catch (Exception $e) {
$result = new wsResponse(100, $e->getMessage()); $result = new wsResponse(100, $e->getMessage());