simplify post urls

This commit is contained in:
2022-04-09 10:14:15 +00:00
parent 531b69663c
commit 68ce65034b
12 changed files with 23 additions and 50 deletions

View File

@@ -137,7 +137,7 @@ class Post(models.Model):
)
def get_absolute_url(self):
return reverse("posts:posts.show", kwargs={"id": self.slug})
return reverse("posts:show", kwargs={"id": self.slug})
def save(self, *args, **kwargs):
# save the post with some defaults

View File

@@ -12,29 +12,6 @@ register = template.Library()
@stringfilter
def tags_to_url(value):
# return "Tag to url: %s" % value
return mark_safe(re.sub(r'\#([\d\w-]+)', r'<a href="/posts/t/\g<1>">#\g<1></a>', value))
def create_a_link_for(v):
v = v.group(1)
try:
m = Member.all_members.get(nickname=v)
str_nickname = str(reverse('member', kwargs={"member_name": m.nickname}))
return '<a href="' + str_nickname + '">' + v + "</a>"
except Exception:
m = None
try:
j = Job.objects.filter(shortterm=v).first
if j:
return '<a href="' + '"' > + j.name + '</a>'
except Exception:
j = None
return "<a href=\"/posts/%s\">%s</a>" % (v, v)
@register.filter(is_safe=True)
def add_internal_links(value):
# m=Member.all_members.get(value)
return mark_safe(re.sub(r'\[\[([\d\w-]+)\]\]', create_a_link_for, value))
return mark_safe(
re.sub(r"\#([\d\w-]+)", r'<a href="/posts/t/\g<1>">#\g<1></a>', value)
)

View File

@@ -7,10 +7,10 @@ from .utils import slug_calc, tag_complete
app_name = apps.PostsConfig.name
urlpatterns = [
path("", views.index, name="posts.index"),
# fet calendar (path have to be ahead posts.show)
path("fet_calendar.ics", views.calendar, name="posts.calendar"),
path("<str:id>", views.show, name="posts.show"),
path("", views.index, name="index"),
# fet calendar (path have to be ahead show)
path("fet_calendar.ics", views.calendar, name="calendar"),
path("<str:id>", views.show, name="show"),
re_path(
r"^(?P<id>[-\w]+)/agenda.pdf$",
views.show_pdf_agenda,
@@ -21,7 +21,7 @@ urlpatterns = [
views.show_pdf_protocol,
name="show_pdf_protocol",
),
path("t/<str:tag>", views.tags, name="posts.tags"),
path("t/<str:tag>", views.tags, name="tags"),
path("func/tag_complete", tag_complete),
path("func/slug_calc", slug_calc),
]