Merge branch 'bugfix/article-link-on-blog'

Code-Poets · Mar 8, 2021 · f1ec392 · f1ec392
2 parents 25eb55a + 16a7954
commit f1ec392
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,9 @@
+### v1.27.1
+
+##### Bugfixes
+- Bugfix article link on blog ([#325](https://github.com/Code-Poets/project-liberation/pull/325))
+
+
 ### v1.27.0
 
 ##### Features

diff --git a/blog/templates/blog/blog_posts_list.haml b/blog/templates/blog/blog_posts_list.haml
@@ -3,6 +3,7 @@
 {% load wagtailimages_tags %}
 {% load pipeline %}
 {% stylesheet 'blog_posts_list' %}
+{% load blog_article_page_filters %}
 
 
 .container.blog-posts-list
@@ -22,7 +23,7 @@
                     .article-wrapper
                         .popular-article-border
                         .popular-article
-                            %a.title{:href => "{% url 'wagtail_serve' article.specific.slug %}"} {{ article.specific.title }}
+                            %a.title{:href => "{% url 'wagtail_serve' article.specific.slug|add_slash %}"} {{ article.specific.title }}
                             .author by
                                 %span.author-name{:onClick => 'showBio(this, "{{ article.specific.author.bio }}")'}
                                     {{ article.specific.author.full_name }}

diff --git a/blog/templates/blog/blog_posts_list_partials/main_article.haml b/blog/templates/blog/blog_posts_list_partials/main_article.haml
@@ -1,12 +1,14 @@
 {% load wagtailcore_tags %}
 {% load thumbnail %}
 {% load wagtailimages_tags %}
+{% load blog_article_page_filters %}
+
 
 .main-article-container
     .row.main-row
         .row.no-margin-row
             .col-12.title
-                %a.main-article-url{:href => "{% url 'wagtail_serve' page.get_main_article.specific.slug %}"}
+                %a.main-article-url{:href => "{% url 'wagtail_serve' page.get_main_article.specific.slug|add_slash %}"}
                     .main-article-title {{ page.get_main_article.title }}
         .row.no-margin-row
             .col-md-6.article-text-container
@@ -30,9 +32,9 @@
                             {{ page.get_main_article.specific.intro }}
                         {% endautoescape %}
                     .read-more
-                        %a.read-more-url{:href => "{% url 'wagtail_serve' page.get_main_article.specific.slug %}"}
+                        %a.read-more-url{:href => "{% url 'wagtail_serve' page.get_main_article.specific.slug|add_slash %}"}
                             %span.more Read the article
             .col-md-6.article-img-container
                 .row
-                    %a.image-url{:href => "{% url 'wagtail_serve' page.get_main_article.specific.slug %}"}
+                    %a.image-url{:href => "{% url 'wagtail_serve' page.get_main_article.specific.slug|add_slash %}"}
                         {% image page.get_main_article.specific.cover_photo fill-1200x628 %}
diff --git a/blog/templates/blog/partials/article_list.haml b/blog/templates/blog/partials/article_list.haml
@@ -2,13 +2,14 @@
 {% load pipeline %}
 {% stylesheet 'blog_posts_list' %}
 {% load wagtailimages_tags %}
+{% load blog_article_page_filters %}
 
 
 .row.rest-posts
     {% for blog_article in article_list  %}
         .col-md-6.article-text-container{:class => "{% if forloop.counter|divisibleby:'2' %}grey-background{% endif %}"}
             .row.title
-                %a.main-article-url{:href => "{% url 'wagtail_serve' blog_article.specific.slug %}"}
+                %a.main-article-url{:href => "{% url 'wagtail_serve' blog_article.specific.slug|add_slash %}"}
                     .main-article-title {{ blog_article.specific.title }}
 
             .row.info-section
@@ -27,7 +28,7 @@
                         {{ blog_article.specific.date }}
 
             .row.article-img-container
-                %a.image-url{:href => "{% url 'wagtail_serve' blog_article.specific.slug %}"}
+                %a.image-url{:href => "{% url 'wagtail_serve' blog_article.specific.slug|add_slash %}"}
                     {% image blog_article.specific.cover_photo fill-1200x628 %}
 
             .row.intro-row
@@ -36,7 +37,7 @@
                         {{ blog_article.specific.intro }}
                     {% endautoescape %}
                 .read-more
-                    %a.read-more-url{:href => "{% url 'wagtail_serve' blog_article.specific.slug %}"}
+                    %a.read-more-url{:href => "{% url 'wagtail_serve' blog_article.specific.slug|add_slash %}"}
                         %span.more Read the article
 
         {% if forloop.counter|divisibleby:"2" %}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "project-liberation",
-  "version": "v1.27.0",
+  "version": "v1.27.1",
   "description": "Packages needed for proper application work.",
   "main": "index.js",
   "scripts": {

diff --git a/project_liberation/settings/base.py b/project_liberation/settings/base.py
@@ -408,7 +408,7 @@
 
 # Wagtail setting variables
 WAGTAIL_SITE_NAME = 'blog'
-WAGTAIL_APPEND_SLASH = False
+WAGTAIL_APPEND_SLASH = True
 
 WAGTAILIMAGES_MAX_UPLOAD_SIZE = 25 * 1024 * 1024
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "project-liberation"
-version = "v1.27.0"
+version = "v1.27.1"
 description = "Necessary packages for Project Liberation"
 authors = ["Karol Beker <[email protected]>"]