From 30399181bf2004b67820a4baf116295f4b23c420 Mon Sep 17 00:00:00 2001 From: Martin Laguna Date: Fri, 30 Sep 2022 11:35:45 -0400 Subject: [PATCH] Fixed change log variables for the correct case Fixed Observations Fixed observations --- .../components/home/caseDetail/ChangeLog.vue | 18 ++++++++++----- resources/assets/js/home/TabsCaseDetail.vue | 2 +- .../engine/methods/cases/ajaxListener.php | 23 +++++++++++++------ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/resources/assets/js/components/home/caseDetail/ChangeLog.vue b/resources/assets/js/components/home/caseDetail/ChangeLog.vue index bf0fbc0e5..c11fb4986 100644 --- a/resources/assets/js/components/home/caseDetail/ChangeLog.vue +++ b/resources/assets/js/components/home/caseDetail/ChangeLog.vue @@ -15,7 +15,7 @@ export default { name: "ChangeLog", props: { - data: Object, + caseData: Object, }, data() { return { @@ -26,11 +26,17 @@ export default { }, computed: { path() { - let url = - window.config.SYS_SERVER_AJAX + - window.config.SYS_URI + - `cases/ajaxListener?action=changeLogHistory`; - return url; + if (this.caseData) { + let url = + window.config.SYS_SERVER_AJAX + + window.config.SYS_URI + + `cases/ajaxListener?action=changeLogHistory` + + `&APP_UID=${this.caseData.APP_UID}` + + `&PRO_UID=${this.caseData.PRO_UID}` + + `&TAS_UID=${this.caseData.TAS_UID}`; + return url; + } + return ''; }, }, mounted() {}, diff --git a/resources/assets/js/home/TabsCaseDetail.vue b/resources/assets/js/home/TabsCaseDetail.vue index db873ad9d..df454fe37 100644 --- a/resources/assets/js/home/TabsCaseDetail.vue +++ b/resources/assets/js/home/TabsCaseDetail.vue @@ -18,7 +18,7 @@ - + diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index 33d9e2d21..eeaa87132 100644 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -481,13 +481,22 @@ class Ajax public function changeLogHistory() { global $G_PUBLISH; - - $idHistory = sprintf( - '%s_%s_%s', - $_SESSION['PROCESS'], - $_SESSION['APPLICATION'], - $_SESSION['TASK'] - ); + + if (isset($_REQUEST['PRO_UID']) && isset($_REQUEST['APP_UID']) && isset($_REQUEST['TAS_UID'])) { + $idHistory = sprintf( + '%s_%s_%s', + $_REQUEST['PRO_UID'], + $_REQUEST['APP_UID'], + $_REQUEST['TAS_UID'] + ); + } else { + $idHistory = sprintf( + '%s_%s_%s', + $_SESSION['PROCESS'], + $_SESSION['APPLICATION'], + $_SESSION['TASK'] + ); + } $oHeadPublisher = headPublisher::getSingleton(); $conf = new Configurations();