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

Merged in release/3.7.5 (pull request #8425)

Browse Source 
release/3.7.5
This commit is contained in:
Paula Quispe
2022-04-14 16:50:45 +00:00
parent 556526bc7f 9923c0f95c
commit a3eecb78a4
64 changed files with 1150 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/AppDelegation.php
View File

@@ -808,7 +808,7 @@ class AppDelegation extends BaseAppDelegation
return $rs->getRow();
}
public function getCurrentIndex($appUid)
public static function getCurrentIndex($appUid)
{
$oCriteria = new Criteria();
$oCriteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);

6
workflow/engine/classes/model/CaseTrackerObject.php
View File

@@ -130,8 +130,8 @@ class CaseTrackerObject extends BaseCaseTrackerObject
) );
$oDataset->next();
}
} catch (Exception $oException) {
throw $Exception;
} catch (Exception $e) {
throw $e;
}
}
@@ -169,7 +169,7 @@ class CaseTrackerObject extends BaseCaseTrackerObject
*
* @return array
*/
public function verifyDynaformAssigCaseTracker ($dynUid, $proUid)
public static function verifyDynaformAssigCaseTracker ($dynUid, $proUid)
{
$res = array();
$oCriteria = new Criteria();

2
workflow/engine/classes/model/Dynaform.php
View File

@@ -705,7 +705,7 @@ class Dynaform extends BaseDynaform
*
* @return array
*/
public function verifyDynaformAssignDynaform ($dynUid, $proUid)
public static function verifyDynaformAssignDynaform ($dynUid, $proUid)
{
$res = array();
$oCriteria = new Criteria();

2
workflow/engine/classes/model/ObjectPermission.php
View File

@@ -141,7 +141,7 @@ class ObjectPermission extends BaseObjectPermission
*
* @return array
*/
public function verifyDynaformAssigObjectPermission ($dynUid, $proUid)
public static function verifyDynaformAssigObjectPermission ($dynUid, $proUid)
{
$res = array();
$oCriteria = new Criteria();

1
workflow/engine/classes/model/Process.php
View File

@@ -147,6 +147,7 @@ class Process extends BaseProcess
$this->setProSubCategory('');
$this->setProIndustry('');
$this->setProCreateDate(date("Y-m-d H:i:s"));
$this->setProUpdateDate($this->getProCreateDate());
$this->setProCreateUser($aData['USR_UID']);
$this->setProHeight(5000);
$this->setProWidth(10000);

8
workflow/engine/classes/model/Step.php
View File

@@ -230,8 +230,8 @@ class Step extends BaseStep
$oDataset->next();
$aRow = $oDataset->getRow();
return (int) $aRow['POSITION'];
} catch (Exception $oException) {
throw $Exception;
} catch (Exception $exception) {
throw $exception;
}
}
@@ -413,7 +413,7 @@ class Step extends BaseStep
*
* @return array
*/
public function verifyDynaformAssigStep ($dynUid, $proUid)
public static function verifyDynaformAssigStep ($dynUid, $proUid)
{
$res = array();
$oCriteria = new Criteria();
@@ -432,7 +432,7 @@ class Step extends BaseStep
return $res;
}
public function getAttribute ($node, $attName)
public static function getAttribute ($node, $attName)
{
foreach ($node->attributes as $attribute) {

14
workflow/engine/classes/model/StepSupervisor.php
View File

@@ -166,8 +166,8 @@ class StepSupervisor extends BaseStepSupervisor
$oDataset->next();
$aRow = $oDataset->getRow();
return (int) $aRow['POSITION'];
} catch (Exception $oException) {
throw $Exception;
} catch (Exception $e) {
throw $e;
}
}
@@ -189,8 +189,8 @@ class StepSupervisor extends BaseStepSupervisor
$oDataset->next();
$aRow = $oDataset->getRow();
return (int) $aRow['POSITION'];
} catch (Exception $oException) {
throw $Exception;
} catch (Exception $e) {
throw $e;
}
}
@@ -217,8 +217,8 @@ class StepSupervisor extends BaseStepSupervisor
$this->update( array ('STEP_UID' => $aRow['STEP_UID'],'PRO_UID' => $aRow['PRO_UID'],'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'],'STEP_UID_OBJ' => $aRow['STEP_UID_OBJ'],'STEP_POSITION' => $aRow['STEP_POSITION'] - 1
) );
}
} catch (Exception $oException) {
throw $Exception;
} catch (Exception $e) {
throw $e;
}
}
@@ -254,7 +254,7 @@ class StepSupervisor extends BaseStepSupervisor
*
* @return array
*/
public function verifyDynaformAssigStepSupervisor ($dynUid, $proUid)
public static function verifyDynaformAssigStepSupervisor ($dynUid, $proUid)
{
$res = array();
$oCriteria = new Criteria();

4
workflow/engine/classes/model/UsersProperties.php
View File

@@ -195,6 +195,10 @@ class UsersProperties extends BaseUsersProperties
$changePassword = 1;
}
}
//Spaces not supported at the end of passwords
if (substr($password, -1) === " ") {
$listErrors[] = 'ID_PPP_SPACES_NOT_SUPPORTED_AT_THE_END_OF_PASSWORD';
}
if ($changePassword == 1) {
$listErrors[] = 'ID_PPP_CHANGE_PASSWORD_AFTER_NEXT_LOGIN';