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

Merged in feature/HOR-2945 (pull request #5582)

Browse Source 
HOR-2945

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-04-05 16:14:02 +00:00
committed by Julio Cesar Laura Avendaño
parent 676139167a caeb941cb2
commit acc8d80f12
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2107,6 +2107,12 @@ msgstr "in"
msgid "This case does not exist" msgid "This case does not exist"
msgstr "This case does not exist" msgstr "This case does not exist"
# TRANSLATION
# LABEL/ID_APPLICATION_OR_INDEX_MISSING
#: LABEL/ID_APPLICATION_OR_INDEX_MISSING
msgid "Application ID or Delegation Index is missing!. The System can not open the case."
msgstr "Application ID or Delegation Index is missing!. The System can not open the case."
# TRANSLATION # TRANSLATION
# LABEL/ID_PLEASE_SELECT_UPGRADE_FILE # LABEL/ID_PLEASE_SELECT_UPGRADE_FILE
#: LABEL/ID_PLEASE_SELECT_UPGRADE_FILE #: LABEL/ID_PLEASE_SELECT_UPGRADE_FILE

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

@@ -1792,6 +1792,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER','en','The case is currently opened by another user','2014-01-15') , ( 'LABEL','ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER','en','The case is currently opened by another user','2014-01-15') ,
( 'LABEL','ID_IN','en','in','2014-01-15') , ( 'LABEL','ID_IN','en','in','2014-01-15') ,
( 'LABEL','ID_CASE_DOES_NOT_EXISTS','en','This case does not exist','2014-01-15') , ( 'LABEL','ID_CASE_DOES_NOT_EXISTS','en','This case does not exist','2014-01-15') ,
( 'LABEL','ID_APPLICATION_OR_INDEX_MISSING','en','Application ID or Delegation Index is missing!. The System can not open the case.','2017-03-30') ,
( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') , ( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') ,
( 'LABEL','ID_PLEASE_SELECT_MAX_X_FIELDS','en','Please select 80 fields at most','2014-01-15') , ( 'LABEL','ID_PLEASE_SELECT_MAX_X_FIELDS','en','Please select 80 fields at most','2014-01-15') ,
( 'LABEL','ID_UPGRADE_READY','en','System upgraded from revision','2014-01-15') , ( 'LABEL','ID_UPGRADE_READY','en','System upgraded from revision','2014-01-15') ,

37
workflow/engine/methods/cases/open.php
View File

@@ -34,25 +34,34 @@ if(isset( $_GET['gmail']) && $_GET['gmail'] == 1){
$tBarGmail = true; $tBarGmail = true;
} }
if (! isset( $_GET['APP_UID'] ) || ! isset( $_GET['DEL_INDEX'] )) { //Check if we have the information for open the case
if (isset( $_GET['APP_NUMBER'] )) { if (!isset($_GET['APP_UID']) && !isset($_GET['APP_NUMBER']) && !isset($_GET['DEL_INDEX'])) {
G::LoadClass( 'case' ); throw new Exception(G::LoadTranslation('ID_APPLICATION_OR_INDEX_MISSING'));
$oCase = new Cases(); }
$appUid = $oCase->getApplicationUIDByNumber( htmlspecialchars($_GET['APP_NUMBER']) ); //Get the APP_UID related to APP_NUMBER
$delIndex = $oCase->getCurrentDelegation( $appUid, $_SESSION['USER_LOGGED'] ); if (!isset($_GET['APP_UID']) && isset($_GET['APP_NUMBER'])) {
if (is_null( $appUid )) { G::LoadClass('case');
throw new Exception( G::LoadTranslation( 'ID_CASE_DOES_NOT_EXISTS' ) ); $oCase = new Cases();
} $appUid = $oCase->getApplicationUIDByNumber(htmlspecialchars($_GET['APP_NUMBER']));
if (is_null( $delIndex )) { if (is_null( $appUid )) {
throw new Exception( G::LoadTranslation( 'ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER' ) ); throw new Exception(G::LoadTranslation('ID_CASE_DOES_NOT_EXISTS'));
}
} else {
throw new Exception( "Application ID or Delegation Index is missing!. The System can't open the case." );
} }
} else { } else {
$appUid = htmlspecialchars($_GET['APP_UID']); $appUid = htmlspecialchars($_GET['APP_UID']);
}
//If we don't have the DEL_INDEX we get the current delIndex. Data reporting tool does not have this information
if (!isset($_GET['DEL_INDEX'])) {
G::LoadClass('case');
$oCase = new Cases();
$delIndex = $oCase->getCurrentDelegation($appUid, $_SESSION['USER_LOGGED']);
if (is_null( $delIndex )) {
throw new Exception(G::LoadTranslation('ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER'));
}
$_GET['DEL_INDEX'] = $delIndex;
} else {
$delIndex = htmlspecialchars($_GET['DEL_INDEX']); $delIndex = htmlspecialchars($_GET['DEL_INDEX']);
} }
$tasUid = (isset($_GET['TAS_UID'])) ? $tasUid = htmlspecialchars($_GET['TAS_UID']) : ''; $tasUid = (isset($_GET['TAS_UID'])) ? $tasUid = htmlspecialchars($_GET['TAS_UID']) : '';
require_once ("classes/model/Step.php"); require_once ("classes/model/Step.php");