fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in bugfix/PMCORE-3951 (pull request #8540)

Browse Source 
PMCORE-3951

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Luciana Nuñez
2022-08-30 16:15:22 +00:00
committed by Julio Cesar Laura Avendaño
parent ca1720add9 7894191249
commit a0aacd69b4
21 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
View File

@@ -308,7 +308,6 @@ class Home
->where('CAL_ID', '=', $id)
->join('ADDITIONAL_TABLES', 'ADDITIONAL_TABLES.ADD_TAB_UID', '=', 'CASE_LIST.ADD_TAB_UID')
->join('PROCESS', 'PROCESS.PRO_UID', '=', 'ADDITIONAL_TABLES.PRO_UID')
->get()
->first();
if (!empty($caseList)) {
$tableName = $caseList->ADD_TAB_NAME;

1
workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
View File

@@ -350,7 +350,6 @@ class TaskSchedulerBM
$scheduler = TaskScheduler::select()
->where('title', '=', $service['title'])
->where('description', '=', $service['description'])
->get()
->first();
if (is_null($scheduler)) {
self::registerScheduledTask($service);

1
workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
View File

@@ -1154,7 +1154,6 @@ class WebEntry
$result = true;
$webentry = WebEntryModel::select('WE_HIDE_ACTIVE_SESSION_WARNING', 'WE_AUTHENTICATION')
->where('WE_UID', '=', $weUid)
->get()
->first();
if ($webentry->WE_AUTHENTICATION === 'LOGIN_REQUIRED') {
$result = intval($webentry->WE_HIDE_ACTIVE_SESSION_WARNING) === 0;

8
workflow/engine/src/ProcessMaker/Model/CaseList.php
View File

@@ -93,7 +93,6 @@ class CaseList extends Model
'ADDITIONAL_TABLES.ADD_TAB_NAME',
'ADDITIONAL_TABLES.PRO_UID'
])
->get()
->first();
return $caseList;
@@ -176,7 +175,7 @@ class CaseList extends Model
$caseList = CaseList::where('CAL_ID', '=', $id);
$caseList->update($attributes);
$model = $caseList->get()->first();
$model = $caseList->first();
if (!is_null($model)) {
$model->CAL_COLUMNS = json_decode($model->CAL_COLUMNS);
}
@@ -230,7 +229,7 @@ class CaseList extends Model
public static function deleteSetting(int $id)
{
$caseList = CaseList::where('CAL_ID', '=', $id);
$model = $caseList->get()->first();
$model = $caseList->first();
if (!is_null($model)) {
$caseList->delete();
$model->CAL_COLUMNS = json_decode($model->CAL_COLUMNS);
@@ -315,7 +314,6 @@ class CaseList extends Model
'CASE_LIST.*',
'ADDITIONAL_TABLES.ADD_TAB_NAME'
])
->get()
->first();
if (empty($model)) {
throw new Exception(G::LoadTranslation('ID_DOES_NOT_EXIST'));
@@ -363,7 +361,6 @@ class CaseList extends Model
//the pmtable not exist
$table = AdditionalTables::where('ADD_TAB_NAME', '=', $tableName)
->get()
->first();
if ($table === null) {
return [
@@ -393,7 +390,6 @@ class CaseList extends Model
//the name of the case list already exist
$list = CaseList::where('CAL_NAME', '=', $array['name'])
->get()
->first();
$requestData['duplicateName'] = $requestData['duplicateName'] ?? '';
if ($requestData['duplicateName'] !== 'continue') {

2
workflow/engine/src/ProcessMaker/Model/Groupwf.php
View File

@@ -67,6 +67,6 @@ class Groupwf extends Model
public static function getGroupId($grpUid)
{
$query = Groupwf::select('GRP_ID')->where('GRP_UID', $grpUid);
return $query->get()->first()->toArray();
return $query->first()->toArray();
}
}

1
workflow/engine/src/ProcessMaker/Model/Process.php
View File

@@ -495,7 +495,6 @@ class Process extends Model
$process = Process::query()
->where($key, $proId)
->where('PRO_STATUS', 'ACTIVE')
->get()
->first();
return !empty($process);
}

2
workflow/engine/src/ProcessMaker/Model/RbacRoles.php
View File

@@ -19,7 +19,7 @@ class RbacRoles extends Model
public static function getRolUidByCode($rolCode)
{
$query = RbacRoles::select('ROL_UID')->where('ROL_CODE', $rolCode);
$query = $query->get()->first();
$query = $query->first();
if (is_null($query)) {
return [];

1
workflow/engine/src/ProcessMaker/Model/Step.php
View File

@@ -18,7 +18,6 @@ class Step extends Model
->where('TAS_UID', '=', $tasUid)
->where('STEP_TYPE_OBJ', '=', $stepTypeObj)
->where('STEP_UID_OBJ', '=', $stepUidObj)
->get()
->first();
return $step;
}

1
workflow/engine/src/ProcessMaker/Model/UserConfig.php
View File

@@ -29,7 +29,6 @@ class UserConfig extends Model
{
$userConfig = UserConfig::where('USR_ID', '=', $id)
->where('USC_NAME', '=', $name)
->get()
->first();
if (empty($userConfig)) {
return null;