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

Merged in bugfix/HOR-3951 (pull request #6093)

Browse Source 
HOR-3951

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
David Callizaya
2017-10-04 01:44:37 +00:00
committed by Julio Cesar Laura Avendaño
parent 57233b7d21 a01d0af088
commit dc16c88124
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27851,6 +27851,24 @@ msgstr "Case created"
msgid "Case routed to" msgid "Case routed to"
msgstr "Case routed to" msgstr "Case routed to"
# TRANSLATION
# LABEL/ID_IMPORTED
#: LABEL/ID_IMPORTED
msgid "IMPORTED"
msgstr "IMPORTED"
# TRANSLATION
# LABEL/ID_NOT_IMPORTED
#: LABEL/ID_NOT_IMPORTED
msgid "NOT IMPORTED"
msgstr "NOT IMPORTED"
# TRANSLATION
# LABEL/ID_CANNOT_IMPORT
#: LABEL/ID_CANNOT_IMPORT
msgid "CANNOT IMPORT"
msgstr "CANNOT IMPORT"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml # additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME #: text - ADD_TAB_NAME

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

@@ -6182,7 +6182,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_VIEW_RESPONSE','en','View Response','2017-02-22') , ( 'LABEL','ID_VIEW_RESPONSE','en','View Response','2017-02-22') ,
( 'LABEL','ID_ERROR_MESSAGE','en','Error Message','2017-02-22') , ( 'LABEL','ID_ERROR_MESSAGE','en','Error Message','2017-02-22') ,
( 'LABEL','ID_CASE_CREATED','en','Case created','2017-06-02') , ( 'LABEL','ID_CASE_CREATED','en','Case created','2017-06-02') ,
( 'LABEL','ID_CASE_ROUTED_TO','en','Case routed to','2017-06-02'); ( 'LABEL','ID_CASE_ROUTED_TO','en','Case routed to','2017-06-02'),
( 'LABEL','ID_IMPORTED','en','IMPORTED','2017-10-03'),
( 'LABEL','ID_NOT_IMPORTED','en','NOT IMPORTED','2017-10-03'),
( 'LABEL','ID_CANNOT_IMPORT','en','CANNOT IMPORT','2017-10-03');
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') , ('AD','','',' ','') ,

14
workflow/engine/methods/authSources/ldapAdvancedProxy.php
View File

@@ -191,6 +191,8 @@ switch ($function) {
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addSelectColumn(RbacUsersPeer::UID_AUTH_SOURCE);
$criteria->addJoin(UsersPeer::USR_UID, RbacUsersPeer::USR_UID);
$criteria->add(UsersPeer::USR_STATUS, "CLOSED", Criteria::NOT_EQUAL); $criteria->add(UsersPeer::USR_STATUS, "CLOSED", Criteria::NOT_EQUAL);
$rsCriteria = UsersPeer::doSelectRS($criteria); $rsCriteria = UsersPeer::doSelectRS($criteria);
@@ -198,8 +200,7 @@ switch ($function) {
while ($rsCriteria->next()) { while ($rsCriteria->next()) {
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
$arrayUser[strtolower($row["USR_USERNAME"])] = $row['UID_AUTH_SOURCE'];
$arrayUser[$row["USR_USERNAME"]] = 1;
} }
//Get data //Get data
@@ -213,11 +214,14 @@ switch ($function) {
foreach ($result["data"] as $value) { foreach ($result["data"] as $value) {
$arrayUserData = $value; $arrayUserData = $value;
if (!isset($arrayUser[$arrayUserData["sUsername"]])) { if (!isset($arrayUser[strtolower($arrayUserData["sUsername"])])) {
$arrayUserData["STATUS"] = "NOT IMPORTED"; $arrayUserData["STATUS"] = G::LoadTranslation("ID_NOT_IMPORTED");
$arrayUserData["IMPORT"] = 1; $arrayUserData["IMPORT"] = 1;
} elseif($authenticationSourceUid === $arrayUser[strtolower($arrayUserData["sUsername"])]) {
$arrayUserData["STATUS"] = G::LoadTranslation("ID_IMPORTED");
$arrayUserData["IMPORT"] = 0;
} else { } else {
$arrayUserData["STATUS"] = "IMPORTED"; $arrayUserData["STATUS"] = G::LoadTranslation("ID_CANNOT_IMPORT");
$arrayUserData["IMPORT"] = 0; $arrayUserData["IMPORT"] = 0;
} }