diff --git a/tcs_site.sqlite b/tcs_site.sqlite index 7ee2823..0031a55 100644 Binary files a/tcs_site.sqlite and b/tcs_site.sqlite differ diff --git a/tcs_site/models/entries.py b/tcs_site/models/entries.py index 11430a8..025a06f 100644 --- a/tcs_site/models/entries.py +++ b/tcs_site/models/entries.py @@ -33,10 +33,16 @@ def get_entries_by_criteria(request, criteria): results = request.dbsession.execute(query).fetchall() return results -def get_entries_by_id(request, _id): - query = """SELECT *, strftime('%d/%m/%Y', created) AS create_date, - strftime('%d/%m/%Y', edited) AS edit_date FROM entries WHERE id=:id;""" - results = request.dbsession.execute(query, {'id':_id}).first() +def get_entries_by_id(request, id): + # is id a numeber or a string ? + # import pdb;pdb.set_trace() + if id.isnumeric(): + query = """SELECT *, strftime('%d/%m/%Y', created) AS create_date, + strftime('%d/%m/%Y', edited) AS edit_date FROM entries WHERE id=:id;""" + else: + query = """SELECT *, strftime('%d/%m/%Y', created) AS create_date, + strftime('%d/%m/%Y', edited) AS edit_date FROM entries WHERE url_id=:id;""" + results = request.dbsession.execute(query, {'id':id}).first() return results def get_entries_count_by_topic(request): diff --git a/tcs_site/routes.py b/tcs_site/routes.py index f5c4e2d..9e124f0 100644 --- a/tcs_site/routes.py +++ b/tcs_site/routes.py @@ -1,7 +1,7 @@ def includeme(config): config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('home', '/') - config.add_route('blog', '/blog/{id:\d+}/{slug}') + config.add_route('blog', '/blog/{id}/{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') diff --git a/tcs_site/templates/blog.jinja2 b/tcs_site/templates/blog.jinja2 index 928e1f7..72fae59 100644 --- a/tcs_site/templates/blog.jinja2 +++ b/tcs_site/templates/blog.jinja2 @@ -21,22 +21,24 @@


{{ body_html | safe }} -
- +

{% if entry.source_link != '' %} {% endif %} - {% if entry.related %} + {% if related != None %} {% endif %} +

{% if request.authenticated_userid %} Topic - Tag : {{ entry.topic_id }} - {{ entry.tag }}
+ Description : {{ entry.description }}
+ URL id : {{ entry.url_id }}
Type : {{ entry.content_type }}
Language : {{ entry.language }}
Statut : {{ entry.status }}
diff --git a/tcs_site/templates/blog_edit.jinja2 b/tcs_site/templates/blog_edit.jinja2 index dbcd086..d180e7e 100644 --- a/tcs_site/templates/blog_edit.jinja2 +++ b/tcs_site/templates/blog_edit.jinja2 @@ -91,7 +91,7 @@

- Topic : {{ entry.topic_id }} - {{ entry.language }}
+ Topic : {{ entry.topic_id }} - {{ entry.tag }}
{% if blog_id != '0' %} Modifié le : {{ entry.edit_date }} {% endif %} diff --git a/tcs_site/templates/home.jinja2 b/tcs_site/templates/home.jinja2 index 2f2e176..2f85ce1 100644 --- a/tcs_site/templates/home.jinja2 +++ b/tcs_site/templates/home.jinja2 @@ -32,7 +32,8 @@

Bài hát
-
Bài hát
+
Tập nhạc
+
CD và K7
diff --git a/tcs_site/templates/layout.jinja2 b/tcs_site/templates/layout.jinja2 index 686cd56..d690376 100644 --- a/tcs_site/templates/layout.jinja2 +++ b/tcs_site/templates/layout.jinja2 @@ -47,6 +47,11 @@ Bài hát +