From 5b4600636b9f33552f3d562d5eb29e9904154acd Mon Sep 17 00:00:00 2001 From: henry jordan Date: Wed, 22 Jun 2022 16:05:04 +0000 Subject: [PATCH] direct case link - case:paused Update observations update --- resources/assets/js/home/MyCases/MyCases.vue | 4 +--- resources/assets/js/home/Paused/Paused.vue | 4 ++-- resources/assets/js/home/Unassigned/Unassigned.vue | 5 +++++ workflow/engine/src/ProcessMaker/BusinessModel/Cases.php | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue index 85b034145..8f9f48427 100644 --- a/resources/assets/js/home/MyCases/MyCases.vue +++ b/resources/assets/js/home/MyCases/MyCases.vue @@ -296,13 +296,11 @@ export default { refresh: false, }); this.$emit("cleanDefaultOption"); - api.cases.pendingtask({APP_NUMBER:params.openapplicationuid}).then((response) => { if (response.data && response.data[0] && response.data[0]['USR_ID'] == 0) { this.claimCase(response.data[0]); } - }) - + }); } } }, diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index 3b4d22da3..95526f6c1 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -411,7 +411,7 @@ export default { }, mounted() { let that = this; - // force to open case + // force to open case paused this.openDefaultCase(); Event.$on('vue-tables.paused.sorted', function (data) { that.$emit("updateSettings", { @@ -475,7 +475,7 @@ export default { if(this.defaultOption) { params = utils.getAllUrlParams(this.defaultOption); if (params && params.app_uid && params.del_index) { - this.openCase({ + this.showModalUnpauseCase({ APP_UID: params.app_uid, DEL_INDEX: params.del_index }); diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue index 1cd17335f..20535a2ee 100644 --- a/resources/assets/js/home/Unassigned/Unassigned.vue +++ b/resources/assets/js/home/Unassigned/Unassigned.vue @@ -458,6 +458,11 @@ export default { refresh: true }; this.$emit("cleanDefaultOption"); + api.cases.pendingtask({APP_NUMBER:params.openapplicationuid}).then((response) => { + if (response.data && response.data.length == 1 && response.data[0] && response.data[0]['USR_ID'] == 0) { + this.claimCase(response.data[0]); + } + }); this.onUpdateFilters(filter); } } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 91f771ef7..c3081217f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -2551,7 +2551,7 @@ class Cases // Filter specific case $query->case($caseNumber); // Filter specific index - if (is_int($index)) { + if ($index > 0) { $query->index($index); } $results = $query->get();