From e7ee93fec3c96ddc0359885231e2a49e6ef23ac1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 27 Aug 2019 10:33:16 +0300 Subject: [PATCH 1/2] fix(core): issue with bind_where in the Entries #186 --- flextype/core/Entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/core/Entries.php b/flextype/core/Entries.php index a79c80aa..25b952f9 100755 --- a/flextype/core/Entries.php +++ b/flextype/core/Entries.php @@ -293,7 +293,7 @@ class Entries $criteria = new Criteria(); // Exec: where - if (isset($bind_and_where['where']['key']) && isset($bind_and_where['where']['expr']) && isset($bind_and_where['where']['value'])) { + if (isset($bind_where['where']['key']) && isset($bind_where['where']['expr']) && isset($bind_where['where']['value'])) { $expr = new Comparison($bind_where['where']['key'], $bind_where['where']['expr'], $bind_where['where']['value']); $criteria->where($expr); } From d340c317c3e35af041b36b7bd321dd40c8772d60 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 27 Aug 2019 10:38:25 +0300 Subject: [PATCH 2/2] feat(core): add ability to work with tags for default theme #186 --- site/themes/default/templates/blog.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/site/themes/default/templates/blog.html b/site/themes/default/templates/blog.html index 76d2ad47..dca6128e 100644 --- a/site/themes/default/templates/blog.html +++ b/site/themes/default/templates/blog.html @@ -8,14 +8,19 @@ {# pagination #} {% set page = query.page %} {% set entries_limit = entries.fetch('blog').entries_limit %} - {% set entries_length = entries.fetchAll('blog', {'order_by': {'field': 'published_at', 'direction': 'desc'}})|length %} + {% if query.tag %} + {% set entries = entries.fetchAll('blog', {'where': {'key': 'tag', 'expr': 'contains', 'value': query.tag}, 'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %} + {% else %} + {% set entries = entries.fetchAll('blog', {'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %} + {% endif %} + {% set entries_length = entries|length %} {% set entries_pages = (entries_length/entries_limit)|round %} {% if page < 1 %}{% set page = 1 %}{% elseif page > entries_pages %}{% set page = entries_pages %}{% endif %} {% set entries_offset = (page-1)*entries_limit %} {% if entries_offset < 0 %}{% set entries_offset = 0 %}{% endif %} {# /pagination #} - {% for entry in entries.fetchAll('blog', {'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %} + {% for entry in entries %}

{{ entry.title }}

{{ entry.summary|shortcode|raw}}