diff --git a/cao_sunyata/models/entries.py b/cao_sunyata/models/entries.py index fa085f8..9478d71 100644 --- a/cao_sunyata/models/entries.py +++ b/cao_sunyata/models/entries.py @@ -19,20 +19,6 @@ def get_entries_by_topic(request, topic, tag): results = request.dbsession.execute(query).fetchall() return results -def get_entries_by_criteria(request, criteria): - search = "%{}%".format(criteria) - query = f"SELECT *, strftime('%d/%m/%Y', edited) AS edit_date FROM entries WHERE title like '{search}' or body like '{search}'" - if request.authenticated_userid == None: - # if user is anonym, display only published posts - query = query + " AND status='publiƩ'" - else: - if request.authenticated_userid != 'admin': - # if user is not 'admin', hide admin posts - query = query + " AND tag != '_admin'" - query = query + " ORDER BY title;" - results = request.dbsession.execute(query).fetchall() - return results - def get_entries_related(request, _id): query = """SELECT *, strftime('%d/%m/%Y', edited) AS edit_date FROM entries_related WHERE id=:id;""" results = request.dbsession.execute(query, {'id':_id}).fetchall() diff --git a/cao_sunyata/routes.py b/cao_sunyata/routes.py index 0d924d5..498416b 100644 --- a/cao_sunyata/routes.py +++ b/cao_sunyata/routes.py @@ -4,7 +4,6 @@ def includeme(config): config.add_route('blog', '/blog/{id:\d+}/{slug}') config.add_route('blog_copy', '/blog_copy/{topic}/{id}') config.add_route('blog_edit', '/blog_edit/{topic}/{id}') - config.add_route('blog_search', '/blog_search') config.add_route('contact', '/contact') config.add_route('images', '/images') config.add_route('image_edit', '/image_edit/{filename}') diff --git a/cao_sunyata/templates/blog_search.jinja2 b/cao_sunyata/templates/blog_search.jinja2 deleted file mode 100644 index 53a624f..0000000 --- a/cao_sunyata/templates/blog_search.jinja2 +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "layout.jinja2" %} - -{% block content %} - -
-
- -
- -
-
- - - -
- - -
- - - - - - - - - - - {% for entry in items %} - - - - - - {% endfor %} - -
TitreTagsDate
- - {{ entry.title }} - - {{ entry.tag }}{{ entry.edit_date }}
-
-
-
- -
-
-{% endblock %} diff --git a/cao_sunyata/templates/layout.jinja2 b/cao_sunyata/templates/layout.jinja2 index 4cae083..f3e5f92 100644 --- a/cao_sunyata/templates/layout.jinja2 +++ b/cao_sunyata/templates/layout.jinja2 @@ -15,6 +15,9 @@ + + @@ -169,10 +172,6 @@