fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in release/3.3 (pull request #6641)

Browse Source 
HOR-4897

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-10-09 15:01:06 +00:00
committed by Julio Cesar Laura Avendaño
parent d1f5ad9662 9ff5ab4d10
commit 651478eecd
11 changed files with 211 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/src/ProcessMaker/AuditLog/AuditLog.php
View File

@@ -167,7 +167,12 @@ class AuditLog
"DeleteUserTask" => G::LoadTranslation("ID_DELETE_USER_TASK"),
"DeleteGroupTask" => G::LoadTranslation("ID_DELETE_GROUP_TASK"),
"ImportProcess" => G::LoadTranslation("ID_IMPORT_PROCESS"),
"DeleteProcess" => G::LoadTranslation("ID_DELETE_PROCESS")
"DeleteProcess" => G::LoadTranslation("ID_DELETE_PROCESS"),
"GSuiteConfigurationSaved" => G::LoadTranslation("ID_G_SUITE_CONFIGURATION_SAVED"),
"GSuiteConnect" => G::LoadTranslation("ID_G_SUITE_CONNECT"),
"GSuiteDisconnect" => G::LoadTranslation("ID_G_SUITE_DISCONNECT"),
"GSuiteLoadGroups" => G::LoadTranslation("ID_G_SUITE_LOAD_GROUPS"),
"GSuiteSyncUsers" => G::LoadTranslation("ID_G_SUITE_SYNC_USERS")
];
}

12
workflow/engine/src/ProcessMaker/Core/AppEvent.php
View File

@@ -9,6 +9,16 @@ class AppEvent
*/
const XMLFORM_RENDER = 0;
/**
* Identify login action
*/
const LOGIN = 1;
/**
* Identify scripts with no login
*/
const SCRIPTS_WITH_NO_LOGIN = 2;
/**
* Represents the AppEvent object.
*
@@ -50,7 +60,7 @@ class AppEvent
* @param object $object
* @return $this
*/
public function dispatch($type, $object)
public function dispatch($type, &$object)
{
foreach ($this->callbacks as $callback) {
$callback($type, $object, $this);

3
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -63,7 +63,8 @@ class System
'disable_download_documents_session_validation' => 0,
'logs_max_files' => 60,
'logs_location' => '',
'logging_level' => 'INFO'
'logging_level' => 'INFO',
'smtp_timeout' => 20
);
/**