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

Merged in develop (pull request #7562)

Browse Source 
Updating feature branch with last changes in develop

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2020-11-18 16:11:02 +00:00
parent 7f9b900cc2 50359a1d43
commit 3d45f51113
6 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gulliver/system/class.phpSqlParser.php
View File

@@ -876,8 +876,6 @@ EOREGEX;
}
break;
}
$shouldItContinue = false;
switch ($upper) {
case 'AS':
$token_count ++;
@@ -888,7 +886,6 @@ EOREGEX;
++ $n;
}
$shouldItContinue = true;
break;
case 'INDEX':
if ($token_category == 'CREATE') {
@@ -910,12 +907,10 @@ EOREGEX;
case 'OUTER':
# $expression .= $token;
$token_count ++;
$shouldItContinue = true;
break;
case 'FOR':
$token_count ++;
$skip_next = true;
$shouldItContinue = true;
break;
case 'LEFT':
case 'RIGHT':
@@ -971,7 +966,6 @@ EOREGEX;
break;
default:
if ($token === false || empty( $token ) || $token === "") {
$shouldItContinue = true;
break;
}
@@ -985,9 +979,6 @@ EOREGEX;
$token_count ++;
break;
}
if ($shouldItContinue === true) {
continue;
}
++ $i;
}
if (substr( trim( $table ), 0, 1 ) == '(') {

4
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

12
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -51939,6 +51939,18 @@ msgstr "Reporting"
msgid "Every hour"
msgstr "Every hour"
# TRANSLATION
# LABEL/ID_ONCE_PER_DAY
#: LABEL/ID_ONCE_PER_DAY
msgid "Once per day"
msgstr "Once per day"
# TRANSLATION
# LABEL/ID_TWICE_PER_DAY
#: LABEL/ID_TWICE_PER_DAY
msgid "Twice per day"
msgstr "Twice per day"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_USERS
#: LABEL/ID_TASK_SCHEDULER_REPORT_USERS

2
workflow/engine/data/mysql/insert.sql
View File

@@ -60266,6 +60266,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_OLD_VERSION','en','old version','2014-01-15') ,
( 'LABEL','ID_ON','en','On','2014-01-15') ,
( 'LABEL','ID_ON_TIME','en','On Time','2014-01-15') ,
( 'LABEL','ID_ONCE_PER_DAY','en','Once per day','2015-03-10') ,
( 'LABEL','ID_OPEN','en','Open','2014-01-15') ,
( 'LABEL','ID_OPENSSL_OPTIONAL','en','OpenSSL is optional.','2014-01-15') ,
( 'LABEL','ID_OPEN_CASE','en','Open Case','2014-01-15') ,
@@ -61287,6 +61288,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_TUE','en','Tue','2014-01-15') ,
( 'LABEL','ID_TYPE','en','Type','2014-01-15') ,
( 'LABEL','ID_TYPE_PROCESS','en','Process Type','2014-10-22') ,
( 'LABEL','ID_TWICE_PER_DAY','en','Twice per day','2014-10-22') ,
( 'LABEL','ID_UID','en','UID','2014-01-15') ,
( 'LABEL','ID_UNABLE_GET_DASHBOARDS','en','Unable to get Dashboards','2014-01-15') ,
( 'LABEL','ID_UNABLE_START_CASE','en','Unable to start a case','2014-01-15') ,

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

@@ -6,6 +6,7 @@ use G;
use Criteria;
use PMLicensedFeatures;
use ProcessMaker\Model\Delegation;
use ProcessMaker\Model\User;
use UsersPeer;
/**
@@ -213,30 +214,51 @@ class Lists
$result = $list->loadList($userUid, $filters);
if (!empty($result)) {
foreach ($result as &$value) {
// For backward compatibility with "light" endpoints, we need to cast to string
$value['APP_NUMBER'] = (string)$value['APP_NUMBER'];
$value['DEL_INDEX'] = (string)$value['DEL_INDEX'];
if (isset($value['DEL_PREVIOUS_USR_UID'])) {
$value['PREVIOUS_USR_UID'] = $value['DEL_PREVIOUS_USR_UID'];
$value['PREVIOUS_USR_USERNAME'] = $value['DEL_PREVIOUS_USR_USERNAME'];
$value['PREVIOUS_USR_FIRSTNAME'] = $value['DEL_PREVIOUS_USR_FIRSTNAME'];
$value['PREVIOUS_USR_LASTNAME'] = $value['DEL_PREVIOUS_USR_LASTNAME'];
} elseif (!empty($value["USR_ID"])) {
$user = User::where("USR_ID", $value["USR_ID"])->first();
$value["PREVIOUS_USR_UID"] = $value["DEL_PREVIOUS_USR_UID"] = $user->USR_UID;
$value["PREVIOUS_USR_USERNAME"] = $value["DEL_PREVIOUS_USR_USERNAME"] = $user->USR_USERNAME;
$value["PREVIOUS_USR_FIRSTNAME"] = $value["DEL_PREVIOUS_USR_FIRSTNAME"] = $user->USR_FIRSTNAME;
$value["PREVIOUS_USR_LASTNAME"] = $value["DEL_PREVIOUS_USR_LASTNAME"] = $user->USR_LASTNAME;
}
if (isset($value['DEL_DUE_DATE'])) {
$value['DEL_TASK_DUE_DATE'] = $value['DEL_DUE_DATE'];
}
if (isset($value['APP_PAUSED_DATE'])) {
$value['APP_UPDATE_DATE'] = $value['APP_PAUSED_DATE'];
}
if (isset($value['DEL_CURRENT_USR_USERNAME'])) {
$value['USR_USERNAME'] = $value['DEL_CURRENT_USR_USERNAME'];
$value['USR_FIRSTNAME'] = $value['DEL_CURRENT_USR_FIRSTNAME'];
$value['USR_LASTNAME'] = $value['DEL_CURRENT_USR_LASTNAME'];
$value['APP_UPDATE_DATE'] = $value['DEL_DELEGATE_DATE'];
}
if (isset($value['DEL_CURRENT_TAS_TITLE']) && $value['DEL_CURRENT_TAS_TITLE'] != '') {
$value['APP_TAS_TITLE'] = $value['DEL_CURRENT_TAS_TITLE'];
} elseif (!empty($value["TAS_TITLE"]) && empty($value["APP_TAS_TITLE"])) {
$value["APP_TAS_TITLE"] = $value["TAS_TITLE"];
}
if (isset($value['APP_STATUS'])) {
$value['APP_STATUS_LABEL'] = G::LoadTranslation("ID_{$value['APP_STATUS']}");
}
//$value = array_change_key_case($value, CASE_LOWER);
if (!empty($value["PRO_TITLE"]) && empty($value["APP_PRO_TITLE"])) {
$value["APP_PRO_TITLE"] = $value["PRO_TITLE"];
}
}
}
$response = array();

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

@@ -30,12 +30,12 @@ class TaskSchedulerBM
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"filew" => "workflow\\engine\bin\cron.php",
"startingTime" => "0:00",
"endingTime" => "0:30",
"startingTime" => null,
"endingTime" => null,
"timezone" => "default",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => 'ID_TASK_SCHEDULER_CALCULATE_ELAPSED_DESC'
],
[
@@ -60,12 +60,12 @@ class TaskSchedulerBM
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"filew" => "workflow\\engine\bin\cron.php",
"startingTime" => "0:00",
"endingTime" => "0:30",
"startingTime" => null,
"endingTime" => null,
"timezone" => "default",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => 'ID_TASK_SCHEDULER_CLEAN_SELF_DESC'
],
[
@@ -183,12 +183,12 @@ class TaskSchedulerBM
"category" => "processmaker_sync",
"file" => "workflow/engine/bin/ldapcron.php",
"filew" => "workflow\\engine\bin\ldapcron.php",
"startingTime" => "0:00",
"endingTime" => "0:30",
"startingTime" => null,
"endingTime" => null,
"timezone" => "default",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_LDAP"
],
[
@@ -198,12 +198,12 @@ class TaskSchedulerBM
"category" => "plugins",
"file" => "workflow/engine/bin/cron.php",
"filew" => "workflow\\engine\bin\cron.php",
"startingTime" => "0:00",
"endingTime" => "0:30",
"startingTime" => null,
"endingTime" => null,
"timezone" => "default",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"expression" => "0 0 * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_PM_PLUGINS_DESC"
]
/*----------------------------------********---------------------------------*/