From f1176082fffdd2c60b29edb5254f982221c2fd5f Mon Sep 17 00:00:00 2001
From: Peter Bowyer <peter@mapledesign.co.uk>
Date: Tue, 2 Sep 2025 13:22:40 +0100
Subject: [PATCH] Admin: Allow sorting tags by label and tag values

---
 assets/components/tagger/js/mgr/extras/tagger.combo.js | 4 +++-
 core/components/tagger/lexicon/de/default.inc.php      | 2 ++
 core/components/tagger/lexicon/en/default.inc.php      | 2 ++
 core/components/tagger/src/Model/TaggerGroup.php       | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/assets/components/tagger/js/mgr/extras/tagger.combo.js b/assets/components/tagger/js/mgr/extras/tagger.combo.js
index 9074556..18e358c 100644
--- a/assets/components/tagger/js/mgr/extras/tagger.combo.js
+++ b/assets/components/tagger/js/mgr/extras/tagger.combo.js
@@ -185,7 +185,9 @@ tagger.combo.SortField = function(config) {
             fields: ['d','v'],
             data: [
                 [_('tagger.group.sort_field_alias') ,'alias'],
-                [_('tagger.group.sort_field_rank') ,'rank']
+                [_('tagger.group.sort_field_rank') ,'rank'],
+                [_('tagger.group.sort_field_tag') ,'tag'],
+                [_('tagger.group.sort_field_label') ,'label']
             ]
         }),
         displayField: 'd',
diff --git a/core/components/tagger/lexicon/de/default.inc.php b/core/components/tagger/lexicon/de/default.inc.php
index af4ae3a..66dfef3 100644
--- a/core/components/tagger/lexicon/de/default.inc.php
+++ b/core/components/tagger/lexicon/de/default.inc.php
@@ -66,6 +66,8 @@
 $_lang['tagger.group.sort_field_desc'] = 'Sortierfeld - Feld für die Sortierung von Tags';
 $_lang['tagger.group.sort_field_alias'] = 'Alias';
 $_lang['tagger.group.sort_field_rank'] = 'Rang';
+$_lang['tagger.group.sort_field_tag'] = 'Tag';
+$_lang['tagger.group.sort_field_label'] = 'Bezeichnung';
 $_lang['tagger.group.show_for_contexts'] = 'Für Kontexte anzeigen';
 $_lang['tagger.group.show_for_contexts_desc'] = 'Kommagetrennte Liste der Kontexte <strong>KEY</strong>s, in der diese Gruppe angezeigt werden soll. Standardmäßig wird die Gruppe in allen Kontexten angezeigt.';
 $_lang['tagger.tab.label'] = 'Tagger';
diff --git a/core/components/tagger/lexicon/en/default.inc.php b/core/components/tagger/lexicon/en/default.inc.php
index 4d984eb..7067d58 100644
--- a/core/components/tagger/lexicon/en/default.inc.php
+++ b/core/components/tagger/lexicon/en/default.inc.php
@@ -71,6 +71,8 @@
 $_lang['tagger.group.sort_field_desc'] = 'Sort field - field used for sorting Tags';
 $_lang['tagger.group.sort_field_alias'] = 'Alias';
 $_lang['tagger.group.sort_field_rank'] = 'Rank';
+$_lang['tagger.group.sort_field_tag'] = 'Tag';
+$_lang['tagger.group.sort_field_label'] = 'Label';
 $_lang['tagger.group.show_for_contexts'] = 'Show for Contexts';
 $_lang['tagger.group.show_for_contexts_desc'] = 'Comma separated list of context <strong>KEY</strong>s for that should be this group displayed. By default the group will appear for all contexts.';
 
diff --git a/core/components/tagger/src/Model/TaggerGroup.php b/core/components/tagger/src/Model/TaggerGroup.php
index 63c7fce..98f21a7 100644
--- a/core/components/tagger/src/Model/TaggerGroup.php
+++ b/core/components/tagger/src/Model/TaggerGroup.php
@@ -40,7 +40,7 @@ public function save($cacheFlag = null)
             $this->set('alias', $this->generateUniqueAlias($this->name));
         }
 
-        if (!in_array($this->sort_field, ['alias', 'rank'])) {
+        if (!in_array($this->sort_field, ['alias', 'rank', 'tag', 'label'])) {
             $this->set('sort_field', 'alias');
         }