Merge branch 'develop' into bugfix/issue-606-tox-versions

nephila · Jun 24, 2020 · e704bc5 · e704bc5
2 parents 502d3d7 + 23c4101
commit e704bc5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/changes/597.bugfix b/changes/597.bugfix
@@ -0,0 +1 @@
+Fix extra migration when customizing BLOG_PLUGIN_TEMPLATE_FOLDERS
diff --git a/changes/598.bugfix b/changes/598.bugfix
@@ -0,0 +1 @@
+Set default pytest configuration
diff --git a/changes/603.bugfix b/changes/603.bugfix
@@ -0,0 +1 @@
+Add missing condition for (date_published) <li> on blog_meta template
diff --git a/djangocms_blog/migrations/0024_auto_20160706_1524.py b/djangocms_blog/migrations/0024_auto_20160706_1524.py
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
             model_name="authorentriesplugin",
             name="template_folder",
             field=models.CharField(
-                default="plugins",
+                default=BLOG_PLUGIN_TEMPLATE_FOLDERS[0][0],
                 verbose_name="Plugin template",
                 max_length=200,
                 help_text="Select plugin template to load for this instance",
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
             model_name="genericblogplugin",
             name="template_folder",
             field=models.CharField(
-                default="plugins",
+                default=BLOG_PLUGIN_TEMPLATE_FOLDERS[0][0],
                 verbose_name="Plugin template",
                 max_length=200,
                 help_text="Select plugin template to load for this instance",
@@ -38,7 +38,7 @@ class Migration(migrations.Migration):
             model_name="latestpostsplugin",
             name="template_folder",
             field=models.CharField(
-                default="plugins",
+                default=BLOG_PLUGIN_TEMPLATE_FOLDERS[0][0],
                 verbose_name="Plugin template",
                 max_length=200,
                 help_text="Select plugin template to load for this instance",

diff --git a/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html b/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html
@@ -6,9 +6,11 @@
         {% trans "by" %} <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}">{% if post.author.get_full_name %}{{ post.author.get_full_name }}{% else %}{{ post.author }}{% endif %}</a>
     </li>
     {% endif %}
+    {% if post.date_published %}
     <li>
         {{ post.date_published|date:"DATE_FORMAT" }}
     </li>
+    {% endif %}
     {% if post.date_featured %}
     <li>
         {{ post.date_featured|date:"DATE_FORMAT" }}

diff --git a/tox.ini b/tox.ini
@@ -164,3 +164,9 @@ ignore =
     *.mo
 ignore-bad-ideas =
     *.mo
+
+[pytest]
+DJANGO_SETTINGS_MODULE = cms_helper
+python_files = test_*.py
+traceback = short
+addopts = --reuse-db