From 3e0ac48049a7fa10b04a81a3def55e784d889541 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Thu, 16 Sep 2021 21:48:00 -0400 Subject: [PATCH] PMCORE-3332 Error message when consulting information about the cases (related to case notes) --- resources/assets/js/home/CaseDetail.vue | 2 +- .../engine/content/translations/english/processmaker.en.po | 6 ++++++ workflow/engine/data/mysql/insert.sql | 1 + workflow/engine/src/ProcessMaker/BusinessModel/Cases.php | 2 +- workflow/engine/src/ProcessMaker/Services/Api/Cases.php | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue index 20701211f..f584e17d7 100644 --- a/resources/assets/js/home/CaseDetail.vue +++ b/resources/assets/js/home/CaseDetail.vue @@ -436,7 +436,7 @@ export default { }) .catch((err) => { if (err.response.data) { - that.showAlert(err.response.data.error.message, "danger"); + that.showAlert(err.response.data.error.message, "info"); } }); }, diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 88f7a1358..69554e5bd 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -26465,6 +26465,12 @@ msgstr "This Month" msgid "This quarter" msgstr "This quarter" +# TRANSLATION +# LABEL/ID_THIS_USER_DOESNT_HAVE_PERMISSIONS_TO_SEE_CASE_NOTES +#: LABEL/ID_THIS_USER_DOESNT_HAVE_PERMISSIONS_TO_SEE_CASE_NOTES +msgid "This user doesn’t have permissions to see the case notes of this process." +msgstr "This user doesn’t have permissions to see the case notes of this process." + # TRANSLATION # LABEL/ID_THIS_WEEK #: LABEL/ID_THIS_WEEK diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index cc93a4965..ae56bbf08 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -61385,6 +61385,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_THE_WEBSITE_CAN_NOT_BE_REACHED','en','The website can not be reached','2020-03-02') , ( 'LABEL','ID_THIS_MONTH','en','This Month','2014-01-15') , ( 'LABEL','ID_THIS_QUARTER','en','This quarter','2014-01-15') , +( 'LABEL','ID_THIS_USER_DOESNT_HAVE_PERMISSIONS_TO_SEE_CASE_NOTES','en','This user doesn’t have permissions to see the case notes of this process.','2021-09-16') , ( 'LABEL','ID_THIS_WEEK','en','This Week','2014-01-15') , ( 'LABEL','ID_THIS_YEAR','en','This Year','2014-01-15') , ( 'LABEL','ID_THREAD_INDEX','en','Thread Index','2014-01-15') , diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index ff33aee0b..aaa3cfbcd 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -2076,7 +2076,7 @@ class Cases $respView = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, 'VIEW'); $respBlock = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, 'BLOCK'); if ($respView['CASES_NOTES'] == 0 && $respBlock['CASES_NOTES'] == 0) { - throw new Exception(G::LoadTranslation("ID_CASES_NOTES_NO_PERMISSIONS")); + throw new Exception(G::LoadTranslation("ID_THIS_USER_DOESNT_HAVE_PERMISSIONS_TO_SEE_CASE_NOTES")); } // Get the notes $appNote = new Notes(); diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php index 1d3dd69a5..deaf22e6d 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php @@ -1184,7 +1184,7 @@ class Cases extends Api return DateTime::convertUtcToIso8601($response, $this->arrayFieldIso8601); } catch (Exception $e) { - throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); + throw new RestException(401, $e->getMessage()); } }