mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-23 05:16:03 +02:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into #218

Browse Source
This commit is contained in:
Awilum
2019-08-27 10:45:16 +03:00
parent 6334c4877f d340c317c3
commit e0996bc6fb
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flextype/core/Entries.php
View File

@@ -292,7 +292,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);
}

9
site/themes/default/templates/blog.html
View File

@@ -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 %}
<a href="{{ entry.slug }}" class="blog-post">
<h3>{{ entry.title }}</h3>
<p>{{ entry.summary|shortcode|raw}}</p>