From d6a0d2e924fb844a46c83277221305c27e006539 Mon Sep 17 00:00:00 2001 From: Nikita Petrenko Date: Thu, 26 Feb 2026 09:46:17 +0200 Subject: [PATCH] Task id parameter in task card macro shows "WebHome" for tasks created using the task macro #99 * Add logic that uses document name from Task object as label or if such object is missing, then to use document name * add missing empty space --- .../resources/TaskManager/TaskPagesSearch.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/application-task-ui/src/main/resources/TaskManager/TaskPagesSearch.xml b/application-task-ui/src/main/resources/TaskManager/TaskPagesSearch.xml index e3cf3d5d..2ba1c09e 100644 --- a/application-task-ui/src/main/resources/TaskManager/TaskPagesSearch.xml +++ b/application-task-ui/src/main/resources/TaskManager/TaskPagesSearch.xml @@ -37,15 +37,26 @@ xwiki/2.1 true {{velocity output="false"}} -#if($xcontext.action == 'get' && "$!{request.outputSyntax}" == 'plain') +#if ($xcontext.action == 'get' && "$!{request.outputSyntax}" == 'plain') #set ($statement = "FROM doc.object(TaskManager.TaskManagerClass) AS taskObject WHERE doc.space <> 'TaskManager.TaskManagerTemplates' AND lower(doc.fullName) LIKE lower(:param)") #set ($param = $services.query.parameter().anyChars().literal("$!request.text").anyChars()) #set ($query = $services.query.xwql($statement).addFilter('unique').addFilter('document').setLimit(10).bindValue('param', $param)) #set ($array = []) #foreach ($taskReference in $query.execute()) #if ($services.security.authorization.hasAccess("view", $taskReference)) + #set ($taskDoc = $xwiki.getDocument($taskReference)) + #set ($taskObj = $taskDoc.getObject('TaskManager.TaskManagerClass')) + #set ($taskTitle = '') + #if ($taskObj) + #set ($taskTitle = "$!taskObj.getProperty('name').value.trim()") + #end + #if ($taskTitle != '') + #set ($label = $taskTitle) + #else + #set ($label = $taskReference.name) + #end #set ($discard = $array.add({ - 'label': $taskReference.name, + 'label': $label, 'value': $services.model.serialize($taskReference, 'compactwiki'), 'hint': $services.model.serialize($taskReference.parent, 'compactwiki') }))