From 076f63bf8adea8ea0ad6a08a24d30ed77e2fb076 Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Fri, 21 Feb 2025 21:34:26 +1100
Subject: [PATCH] Fix tag issues

---
 data/db.sqlite3                               | Bin 368640 -> 385024 bytes
 .../0033_add_tag_slug_description.py          |  36 ++++++++++++++++++
 links/models.py                               |   9 ++++-
 links/templates/links/tag_list.html           |   2 +-
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 links/migrations/0033_add_tag_slug_description.py

diff --git a/data/db.sqlite3 b/data/db.sqlite3
index efdab9264011adf7004f7b5232667a3481564d3a..819d5883c08931e9a388549075723727127708b4 100644
GIT binary patch
delta 1203
zcmZ`&O=uKJ6t1f7vS%{st{x|G(AhOHnxLRVb=UkE1RZCyK@ir1C;u|-OlNGS^B>~~
zF^PHz7!YMxip}D2!=fuFqxNABdf3yVA_x+}bp;VT_>+q$qG(OX1ktgZSKU;7?|a|l
zt2cFP)zq!<xk!)!01hpMB))%~-^?%r(Hy**KTlR>#a4KySehfMSQ&a)R&*Pohm|3{
zh%#x0LAX2ZI{n2FN*U|1^7)=otI#vz9xe3b?UCHDGdSuD^qbU-Z=vQE(`YqlCu5z4
z5jEqK(PZU^5K-}7?WMM(Vo+U^wP&EI{8RLzwn=J%i_BHVK;=VJf{>k}Hz<^;6oPBG
zl7;OuTmuv3A-%wP7M}LTZFB&7V~63)$96mp2)qw)x17~}*L;CD4R0I%^2@$EzHKY!
z@e9dAGw{CGkwurGH{FQOBG1aB2$V&igM!iJO$5J~p6^8>ByYY~-gvwc%)Ta-*6b5f
zp3)7UinfCwaKW!SUbPZVgLlByUP%N!Li?((Ac+MUr-4r}f|LHEd`QM2egR_t^%;B(
z%HrsP!2E`c37$r{Lp7J%J!qV$Zc%u^+bQ8LzYv8Al_5Qc+D?&iCEU^iPxp;lhh2L)
zW%*}6H;Sl<|A}y_%mW&aN}{UXi!yw+h<?<o*0i;bS;M&_*6>Dy@~cG{n$z*QwN-}$
zDg@*vDUrCgpk31P+B)@-T2^<fP`LB7aqq5x0wU?O8nH`O-=J%MWo)dI8qp+8(pchq
zC&{f#sa*{U2n(t(&;BR3wSRj*Slmpd#+<x8(Ct^iY5`r%@14NwJL*7L(o7Tv1`4j7
z@hPBLV4Hbx0<YUp2OEneWBvBAk+h<KkU)kweJr=GuY-&yl3PoqQrC)_(z6q|u2M!*
zsoW8#-^$=x^}FAx&R8nmJ8at-xrY4sSgx-#6;BLWPChNwbnc$Sb#<DF7<JvgE>zQb
zX0pD{m|-xd&nnp4p#p-U_aOgw61Qxs)4LHjP0MMh-U%`b$b0gf+$OW0wjiG&jR7eF
zmuw91xli)GwO;@Qj65J$$bv}uoBU7a$UkCm#=p(_d4muw`K2&i)P%4U^jl7KTEv4y
M>=E(H;?P0x8M41FJpcdz

delta 702
zcmYk4OH30%7{}+a!?xRYx23?MRFP<jCbrovh=Ap>B*c)=$bpN7#9i!CE2S+D5sgqD
z2ZAI5;V_A>BNqiBRrh2h@n-Pkg$r;sG59zb36aFvG#V%QzRdiR|9|G2@0;9|CpXI$
zD|{*d;2Mj+>&epj8lr;mz3fJONh-d|xU8{MTH#?if&<IE*UYQRI?4z9k_YdL-Rx8?
zE_a6?i9uWmQ^|Dy@bwWRA>@CDF@%w6<&6S41s9`H%Ih%50SfDu2fYbObvTos^!7k&
zv=`1F1=$5|P6y;Zxy<R}W6|OIDf|*%I622hN3>`gAK?$^nN_W$RhVy8bQFSROah?S
z&i0yy9lTss1!rO-MsLb2JSCeM9<g_p9!CLa9XDVPoZaq2EU>lR$DO?^+NBAeIUv24
zW~6pY%#xf3Ynn`RJ6t&(-{Au8(PZ4rv^WXSv}5%9I4P%J$4S7G$Yc^Jv&mueQu<?u
zt97N#JHt`l27Ve^BPVFrE+-3PV`I%lHk9e=1XDksAOZJ{o5{4%L<-`!yG-0SWSUJ}
z0l+;5vPLo<#RWI*C3DmFm|JIOtQi&D7ILK4og6R{<|SwoAKl84lhq+L5>gvZDHj?e
z7aMCL;fDH1om#JT2zIH`3Xl$^&(fCVT_+Eur7n@KERYWR?H%zc_GgrU6p%{9eou>g
z)^*@Y3A__Jg8V>{M&`IfE{)sJ5Nd(5-~gmpE2DVId7BP$#800>;(R?%UO}V|Q6DDC
z>8`2RATL)|!s+CHU10<AZ&I#MwI7wxGZLw%8wPBpu{0FvEs6NyIjaqmcBl2pKo1e!
LH_?|BFIoHpIqSX6

diff --git a/links/migrations/0033_add_tag_slug_description.py b/links/migrations/0033_add_tag_slug_description.py
new file mode 100644
index 0000000..5ada891
--- /dev/null
+++ b/links/migrations/0033_add_tag_slug_description.py
@@ -0,0 +1,36 @@
+from django.db import migrations, models
+from django.utils.text import slugify
+from django.utils.translation import gettext_lazy as _
+
+
+def populate_tag_slugs(apps, schema_editor):
+    Tag = apps.get_model('links', 'Tag')
+    for tag in Tag.objects.all():
+        tag.slug = slugify(tag.name)
+        tag.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('links', '0032_remove_post_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tag',
+            name='slug',
+            field=models.SlugField(max_length=100, null=True, unique=True, verbose_name=_('Slug')),
+        ),
+        migrations.AddField(
+            model_name='tag',
+            name='description',
+            field=models.TextField(blank=True, verbose_name=_('Description')),
+        ),
+        migrations.RunPython(populate_tag_slugs, reverse_code=migrations.RunPython.noop),
+        migrations.AlterField(
+            model_name='tag',
+            name='slug',
+            field=models.SlugField(max_length=100, unique=True, verbose_name=_('Slug')),
+        ),
+    ]
diff --git a/links/models.py b/links/models.py
index ac8f1fa..74c567e 100644
--- a/links/models.py
+++ b/links/models.py
@@ -144,6 +144,8 @@ def generate_random_color():
 
 class Tag(models.Model):
     name = models.CharField(_('Name'), max_length=50, unique=True)
+    slug = models.SlugField(_('Slug'), max_length=100, unique=True)
+    description = models.TextField(_('Description'), blank=True)
     created_at = models.DateTimeField(_('Created at'), auto_now_add=True)
     updated_at = models.DateTimeField(_('Updated at'), auto_now=True)
 
@@ -156,7 +158,12 @@ class Tag(models.Model):
         return self.name
 
     def get_absolute_url(self):
-        return reverse('tag-detail', kwargs={'pk': self.pk})
+        return reverse('tag-detail', kwargs={'slug': self.slug})
+
+    def save(self, *args, **kwargs):
+        if not self.slug:
+            self.slug = slugify(self.name)
+        super().save(*args, **kwargs)
 
 class Page(models.Model):
     class ProcessStatus(models.TextChoices):
diff --git a/links/templates/links/tag_list.html b/links/templates/links/tag_list.html
index e2f8e96..2f4ea04 100644
--- a/links/templates/links/tag_list.html
+++ b/links/templates/links/tag_list.html
@@ -26,7 +26,7 @@
                     {% endwith %}
                 </div>
             </div>
-        </a>
+        <!-- </a> -->
         {% empty %}
         <div class="col-span-full text-center py-8 text-gray-500">
             {% trans "No tags found." %}