phuoc/cao_sunyata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace blog_search by google search

Browse Source
This commit is contained in:
Phuoc
2025-10-08 14:21:55 +02:00
parent 75d6e4662d
commit e1c7cceb6a
6 changed files with 11 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cao_sunyata/models/entries.py
View File

@@ -19,20 +19,6 @@ def get_entries_by_topic(request, topic, tag):
results = request.dbsession.execute(query).fetchall() results = request.dbsession.execute(query).fetchall()
return results 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): def get_entries_related(request, _id):
query = """SELECT *, strftime('%d/%m/%Y', edited) AS edit_date FROM entries_related WHERE id=: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() results = request.dbsession.execute(query, {'id':_id}).fetchall()

1
cao_sunyata/routes.py
View File

@@ -4,7 +4,6 @@ def includeme(config):
config.add_route('blog', '/blog/{id:\d+}/{slug}') config.add_route('blog', '/blog/{id:\d+}/{slug}')
config.add_route('blog_copy', '/blog_copy/{topic}/{id}') config.add_route('blog_copy', '/blog_copy/{topic}/{id}')
config.add_route('blog_edit', '/blog_edit/{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('contact', '/contact')
config.add_route('images', '/images') config.add_route('images', '/images')
config.add_route('image_edit', '/image_edit/{filename}') config.add_route('image_edit', '/image_edit/{filename}')

48
cao_sunyata/templates/blog_search.jinja2
View File

@@ -1,48 +0,0 @@
{% extends "layout.jinja2" %}
{% block content %}
<div class="card mb-0">
<div class="card-body">
<form id="search-form" class="form-horizontal" role="form" action="/blog_search" method="post">
<div class="mb-3">
<div class="input-group mb-3">
<input type="text" class="form-control" name="criteria">
<button class="btn btn-primary" type="submit" name="form.submitted">Rechercher</button>
</div>
</form>
<div class="row">
<table class="table table-sm">
<thead>
<tr>
<th>Titre</th>
<th>Tags</th>
<th>Date</th>
<th></th>
</tr>
</thead>
<tbody class="table-group-divider">
{% for entry in items %}
<tr>
<td>
<a href="{{ request.route_url('blog', id=entry.id, slug='slug') }}">
{{ entry.title }}
</a>
</td>
<td>{{ entry.tag }}</td>
<td>{{ entry.edit_date }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<br />
<br />
</div>
</div>
{% endblock %}

14
cao_sunyata/templates/layout.jinja2
View File

@@ -15,6 +15,9 @@
<script src="{{request.static_url('cao_sunyata:static/js/simplebar.js')}}"></script> <script src="{{request.static_url('cao_sunyata:static/js/simplebar.js')}}"></script>
<script src="{{request.static_url('cao_sunyata:static/js/sidebarmenu.js')}}"></script> <script src="{{request.static_url('cao_sunyata:static/js/sidebarmenu.js')}}"></script>
<script src="{{request.static_url('cao_sunyata:static/js/app.min.js')}}"></script> <script src="{{request.static_url('cao_sunyata:static/js/app.min.js')}}"></script>
<!-- moteur de recherche Google -->
<script async src="https://cse.google.com/cse.js?cx=b1b21623144614306">
</script>
</head> </head>
<body> <body>
@@ -169,10 +172,6 @@
</ul> </ul>
<div class="navbar-collapse justify-content-end px-0" id="navbarNav"> <div class="navbar-collapse justify-content-end px-0" id="navbarNav">
<ul class="navbar-nav flex-row ms-auto align-items-center justify-content-end"> <ul class="navbar-nav flex-row ms-auto align-items-center justify-content-end">
<li>
<a class="nav-link" href="{{ request.route_url('blog_search') }}" title="Recherche">
<i class="ti ti-search fs-7"></i></a>
</li>
{% if request.authenticated_userid %} {% if request.authenticated_userid %}
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="btn btn-light dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false"> <a class="btn btn-light dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-expanded="false">
@@ -224,6 +223,8 @@
{% endfor %} {% endfor %}
</p> </p>
<div class="gcse-search"></div>
<!-- display page content--> <!-- display page content-->
{% block content %} {% block content %}
<p>No content</p> <p>No content</p>
@@ -239,7 +240,10 @@
</div> </div>
</div> </div>
<!-- moteur de recherche Google -->
<script async src="https://cse.google.com/cse.js?cx=b1b21623144614306">
</script>
<div class="gcse-search"></div>
<!-- Global site tag (gtag.js) - Google Analytics --> <!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-NBVRNJ9C0Y"></script> <script async src="https://www.googletagmanager.com/gtag/js?id=G-NBVRNJ9C0Y"></script>
<script> <script>

2
cao_sunyata/templates/settings.jinja2
View File

@@ -53,6 +53,8 @@
<ul> <ul>
<li>cao_sunyata {{ app_version }}</li> <li>cao_sunyata {{ app_version }}</li>
<li>Pyramid {{ pyramid_version }}</li> <li>Pyramid {{ pyramid_version }}</li>
<li>Bootstrap v5.3.0</li>
<li>jQuery v3.4.0</li>
<li>Markdown {{ markdown_version }}</li> <li>Markdown {{ markdown_version }}</li>
<li>SQLAlchemy {{ sqlalchemy_version }}</li> <li>SQLAlchemy {{ sqlalchemy_version }}</li>
<li>SQLite {{ sqlite_version }}</li> <li>SQLite {{ sqlite_version }}</li>

18
cao_sunyata/views/blog.py
View File

@@ -225,24 +225,6 @@ def related_edit(request):
} }
@view_config(route_name='blog_search', renderer='../templates/blog_search.jinja2')
def blog_search(request):
criteria = ''
items = []
if 'form.submitted' in request.params:
criteria = request.params['criteria']
# si afficher tous les fiches ?
items = get_entries_by_criteria(request, criteria)
return {
'page_title': "Rechercher",
'items': items,
'criteria': criteria,
}
@view_config(route_name='topic', renderer='../templates/topic.jinja2') @view_config(route_name='topic', renderer='../templates/topic.jinja2')
def topic(request): def topic(request):
topic = request.matchdict['topic'] topic = request.matchdict['topic']