From 02949e396d019cec69e099092ecaf021569a2959 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Tue, 10 Sep 2024 11:20:25 -0400 Subject: [PATCH 1/2] feature/FOUR-18623 --- ProcessMaker/Models/ProcessRequest.php | 6 ++---- resources/js/requests/components/RequestsListing.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ProcessMaker/Models/ProcessRequest.php b/ProcessMaker/Models/ProcessRequest.php index 989521a8b9..5d48a1fc1b 100644 --- a/ProcessMaker/Models/ProcessRequest.php +++ b/ProcessMaker/Models/ProcessRequest.php @@ -165,7 +165,7 @@ class ProcessRequest extends ProcessMakerModel implements ExecutionInstanceInter 'participants', ]; - const DEFAULT_CASE_TITLE = 'Case #{{_request.case_number}}'; + const DEFAULT_CASE_TITLE = '{{_request.name}}'; /** * Determine whether the item should be indexed. @@ -1018,9 +1018,7 @@ public function evaluateCaseTitle(string $mustacheTitle, array $data, bool $form if ($formatted) { $mustache = new MustacheExpressionEvaluator([ 'escape' => function ($value) { - return '' . - htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . - ''; + return htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); }, ]); $title = $mustache->render($mustacheTitle, $data); diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue index 7f4d5be172..bae9339fdb 100644 --- a/resources/js/requests/components/RequestsListing.vue +++ b/resources/js/requests/components/RequestsListing.vue @@ -409,7 +409,7 @@ export default { return ` - ${value.case_title_formatted || value.case_title || ""} + ${value.case_title_formatted || value.case_title || value.name} `; }, formatParticipants(participants) { From 40dc3cc353fa0cb938cfb4b0efcdca4bf38a114e Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Tue, 10 Sep 2024 14:27:35 -0400 Subject: [PATCH 2/2] feature/FOUR-18623 --- ProcessMaker/Models/ProcessRequest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ProcessMaker/Models/ProcessRequest.php b/ProcessMaker/Models/ProcessRequest.php index 5d48a1fc1b..8b83e3a498 100644 --- a/ProcessMaker/Models/ProcessRequest.php +++ b/ProcessMaker/Models/ProcessRequest.php @@ -165,8 +165,6 @@ class ProcessRequest extends ProcessMakerModel implements ExecutionInstanceInter 'participants', ]; - const DEFAULT_CASE_TITLE = '{{_request.name}}'; - /** * Determine whether the item should be indexed. * @@ -1002,7 +1000,7 @@ public function getCaseTitleFromProcess(): string $caseTitle = $this->process()->select('case_title')->first()->case_title; } - return $caseTitle ?: self::DEFAULT_CASE_TITLE; + return $caseTitle ?: $this->name; } /** @@ -1018,7 +1016,9 @@ public function evaluateCaseTitle(string $mustacheTitle, array $data, bool $form if ($formatted) { $mustache = new MustacheExpressionEvaluator([ 'escape' => function ($value) { - return htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + return '' . + htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . + ''; }, ]); $title = $mustache->render($mustacheTitle, $data);