[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Webmail: move to tracker item lookup result is inaccurate

Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
3c5ba65a by Merci Jacob at 2025-08-27T13:26:39+00:00
[FIX] Webmail: move to tracker item lookup result is inaccurate
---
* [FIX] Webmail: move to tracker item lookup result is inacurate

See merge request tikiwiki/tiki!8416

- - - - -


5 changed files:

- lib/cypht/modules/tiki/functions.php
- lib/cypht/modules/tiki/general_modules.php
- lib/cypht/modules/tiki/js_modules/moveToTracker.js
- lib/cypht/modules/tiki/js_modules/utils/moveToTrackerSearch.utils.js
- lib/cypht/modules/tiki/setup.php


Changes:

=====================================
lib/cypht/modules/tiki/functions.php
=====================================
@@ -458,7 +458,7 @@ if (! hm_exists('append_to_msg_headers')) {
     }
 }
 
-function find_relevant_tracker_items($keywords, $multivalueField = '', $searchArgs = [])
+function find_relevant_tracker_items($keywords, $multivalueField = '', $searchArgs = [], $avoidSubQueries = false)
 {
     global $prefs;
 
@@ -493,9 +493,13 @@ function find_relevant_tracker_items($keywords, $multivalueField = '', $searchAr
         }, $fields));
         $query->filterMultivalue($filterField, $keywords);
     } else {
-        $subq = $query->getSubQuery('keywords');
-        foreach (explode(' ', $keywords) as $keyword) {
-            $subq->filterContent($keyword);
+        if ($avoidSubQueries) {
+            $query->filterContent($keywords);
+        } else {
+            $subq = $query->getSubQuery('keywords');
+            foreach (explode(' ', $keywords) as $keyword) {
+                $subq->filterContent($keyword);
+            }
         }
     }
 


=====================================
lib/cypht/modules/tiki/general_modules.php
=====================================
@@ -494,7 +494,7 @@ class Hm_Handler_get_msg_tracker_items extends Hm_Handler_Module
             if (isset($this->request->post['tracker_id'])) {
                 $searchArgs['field_id'] = $this->request->post['field_id'];
             }
-            $this->out('tracker_items', find_relevant_tracker_items($this->request->post['lookup'], searchArgs: $searchArgs));
+            $this->out('tracker_items', find_relevant_tracker_items($this->request->post['lookup'], searchArgs: $searchArgs, avoidSubQueries: $this->request->post['is_manual_search'] ?? false));
             return;
         }
 


=====================================
lib/cypht/modules/tiki/js_modules/moveToTracker.js
=====================================
@@ -17,7 +17,7 @@ function showMoveToTrackerModal(onSuccess) {
 
             Hm_Ajax.request([
                 {name: 'hm_ajax_hook', value: 'ajax_tiki_msg_tracker_items'},
-                {name: 'lookup', value: $('.header_subject th').text()},
+                {name: 'lookup', value: $('.js-header_subject').text().replace(/[^\w\s]/g, '')},
                 {name: 'limit', value: 5},
                 {name: 'sort_mode', value: 'score_desc'},
             ], (res) => {


=====================================
lib/cypht/modules/tiki/js_modules/utils/moveToTrackerSearch.utils.js
=====================================
@@ -37,6 +37,7 @@ function moveToTrackerItemSearchHandler(onSuccess) {
             Hm_Ajax.request([
                 {name: 'hm_ajax_hook', value: 'ajax_tiki_msg_tracker_items'},
                 {name: 'lookup', value: keyword},
+                {name: 'is_manual_search', value: true},
                 {name: 'tracker_id', value: tracker_id},
                 {name: 'field_id', value: field_id},
                 {name: 'limit', value: 100},


=====================================
lib/cypht/modules/tiki/setup.php
=====================================
@@ -322,5 +322,6 @@ return [
     'field_id' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     'in_reply_to' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     'auto_move' => FILTER_VALIDATE_BOOLEAN,
+    'is_manual_search' => FILTER_VALIDATE_BOOLEAN,
   ]
 ];



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3c5ba65af9ebfce116d1ac98ce00d2c93761e9e0

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3c5ba65af9ebfce116d1ac98ce00d2c93761e9e0
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs