a3x/nyaa
1
0
Fork 0
mirror of https://gitlab.com/SIGBUS/nyaa.git synced 2024-12-22 20:40:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix category name on icon titletext, fixes #131

Browse source 
Also reformats the cat_id if-logic
This commit is contained in:
TheAMM 2017-05-19 15:24:09 +03:00
parent 18ebf201b8
commit e554f9ae97
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nyaa/routes.py
View file

@ -62,6 +62,12 @@ def filter_truthy(input_list):
return [item for item in input_list if item] return [item for item in input_list if item]
@app.template_global()
def category_name(cat_id):
''' Given a category id (eg. 1_2), returns a category name (eg. Anime - English-translated) '''
return ' - '.join(get_category_id_map().get(cat_id, ['???']))
@app.errorhandler(404) @app.errorhandler(404)
def not_found(error): def not_found(error):
return flask.render_template('404.html'), 404 return flask.render_template('404.html'), 404

4
nyaa/templates/search_results.html
View file

@ -48,11 +48,11 @@
{% set torrents = torrent_query if use_elastic else torrent_query.items %} {% set torrents = torrent_query if use_elastic else torrent_query.items %}
{% for torrent in torrents %} {% for torrent in torrents %}
<tr class="{% if torrent.deleted %}deleted{% elif torrent.hidden %}warning{% elif torrent.remake %}danger{% elif torrent.trusted %}success{% else %}default{% endif %}"> <tr class="{% if torrent.deleted %}deleted{% elif torrent.hidden %}warning{% elif torrent.remake %}danger{% elif torrent.trusted %}success{% else %}default{% endif %}">
{% set cat_id = (torrent.main_category_id|string) + '_' + (torrent.sub_category_id|string) if use_elastic else (torrent.main_category.id|string) + '_' + (torrent.sub_category.id|string) %} {% set cat_id = use_elastic and ((torrent.main_category_id|string) + '_' + (torrent.sub_category_id|string)) or torrent.sub_category.id_as_string %}
{% set icon_dir = config.SITE_FLAVOR %} {% set icon_dir = config.SITE_FLAVOR %}
<td style="padding:0 4px;"> <td style="padding:0 4px;">
{% if use_elastic %} {% if use_elastic %}
<a href="/?c={{ cat_id }}" title="{{ torrent.main_category_id }} - {{ torrent.sub_category_id }}"> <a href="/?c={{ cat_id }}" title="{{ category_name(cat_id) }}">
{% else %} {% else %}
<a href="/?c={{ cat_id }}" title="{{ torrent.main_category.name }} - {{ torrent.sub_category.name }}"> <a href="/?c={{ cat_id }}" title="{{ torrent.main_category.name }} - {{ torrent.sub_category.name }}">
{% endif %} {% endif %}