[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] ItemLink: add missing displayFieldsListSort parameter to lazyload URL in itemlink.tpl

Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
64b4340f by Olivier Kango at 2025-10-22T20:01:40+00:00
[FIX] ItemLink: add missing displayFieldsListSort parameter to lazyload URL in itemlink.tpl
---
* [FIX] ItemLink: add missing displayFieldsListSort parameter to lazyload URL in itemlink.tpl

See merge request tikiwiki/tiki!8810

- - - - -


2 changed files:

- lib/core/Services/Tracker/Controller.php
- templates/trackerinput/itemlink.tpl


Changes:

=====================================
lib/core/Services/Tracker/Controller.php
=====================================
@@ -3192,6 +3192,13 @@ class Services_Tracker_Controller
         $listFields = $input->listFields->text();
         $limit = $input->limit->int();
 
+        $displaySort = null;
+        try {
+            $displaySort = $input->displayFieldsListSort->text();
+        } catch (\Throwable $e) {
+            $displaySort = null;
+        }
+
         if (! $listFields) {
             $listFields = $field;
         }
@@ -3215,6 +3222,14 @@ class Services_Tracker_Controller
             $data[] = $item;
         }
 
+        if ($displaySort === 'formatted' && ! empty($data)) {
+            usort($data, function ($a, $b) {
+                $ta = $a['label'] ?? '';
+                $tb = $b['label'] ?? '';
+                return strnatcasecmp($ta, $tb);
+            });
+        }
+
         return $data;
     }
 


=====================================
templates/trackerinput/itemlink.tpl
=====================================
@@ -80,7 +80,23 @@
             {/jq}
         {/if}
     {else}
-        <select name="{$field.html_name}" {if $data.preselection and $data.crossSelect neq 'y'}disabled="disabled"{/if} {if $data.selectMultipleValues}multiple="multiple"{/if} class="form-select" {if $field.isMandatory eq 'y'} required{/if} {if $field.options_map.lazyload}data-remote-source-url="{service external=true controller=tracker action=findItems trackerId=$field.options_map.trackerId field=$field.options_map.fieldId listFields=$data.listFields limit=50}"{/if}>
+        <select name="{$field.html_name}"
+            {if $data.preselection and $data.crossSelect neq 'y'}disabled="disabled"{/if}
+            {if $data.selectMultipleValues}multiple="multiple"{/if}
+            class="form-select"
+            {if $field.isMandatory eq 'y'} required{/if}
+            {if $field.options_map.lazyload}
+                data-remote-source-url="{service external=true
+                    controller=tracker
+                    action=findItems
+                    trackerId=$field.options_map.trackerId
+                    field=$field.options_map.fieldId
+                    listFields=$data.listFields
+                    displayFieldsListSort=$field.options_map.displayFieldsListSort
+                    limit=50
+                }"
+            {/if}
+        >
             {if $field.isMandatory ne 'y' || empty($field.value)}
                 <option value=""></option>
             {/if}



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/64b4340f05ed9c3ab1e8c951627623303d65d471

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/64b4340f05ed9c3ab1e8c951627623303d65d471
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