voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HTTP redirect /tag/synonym to /tag/master.

Browse source
This commit is contained in:
voussoir 2017-09-18 14:16:33 -07:00
parent f4ee7ddd9e
commit 4836efcf23
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
frontends/etiquette_flask/etiquette_flask/etiquette_flask.py
View file

@ -781,12 +781,18 @@ def get_search_json():
return jsonify.make_json_response(search_results) return jsonify.make_json_response(search_results)
@site.route('/tag/<specific_tag>') @site.route('/tag/<specific_tag_name>')
@site.route('/tags') @site.route('/tags')
@session_manager.give_token @session_manager.give_token
def get_tags_html(specific_tag=None): def get_tags_html(specific_tag_name=None):
if specific_tag is not None: if specific_tag_name is None:
specific_tag = P_tag(specific_tag, response_type='html') specific_tag = None
else:
specific_tag = P_tag(specific_tag_name, response_type='html')
if specific_tag.name != specific_tag_name:
new_url = request.url.replace('/tag/' + specific_tag_name, '/tag/' + specific_tag.name)
response = flask.redirect(new_url)
return response
tags = get_tags_core(specific_tag) tags = get_tags_core(specific_tag)
session = session_manager.get(request) session = session_manager.get(request)
include_synonyms = request.args.get('synonyms') include_synonyms = request.args.get('synonyms')
@ -800,12 +806,17 @@ def get_tags_html(specific_tag=None):
) )
return response return response
@site.route('/tag/<specific_tag>.json') @site.route('/tag/<specific_tag_name>.json')
@site.route('/tags.json') @site.route('/tags.json')
@session_manager.give_token @session_manager.give_token
def get_tags_json(specific_tag=None): def get_tags_json(specific_tag_name=None):
if specific_tag is not None: if specific_tag_name is None:
specific_tag = P_tag(specific_tag, response_type='json') specific_tag = None
else:
specific_tag = P_tag(specific_tag_name, response_type='json')
if specific_tag.name != specific_tag_name:
new_url = request.url.replace('/tag/' + specific_tag_name, '/tag/' + specific_tag.name)
return flask.redirect(new_url)
tags = get_tags_core(specific_tag=specific_tag) tags = get_tags_core(specific_tag=specific_tag)
include_synonyms = request.args.get('synonyms') include_synonyms = request.args.get('synonyms')
include_synonyms = include_synonyms is None or etiquette.helpers.truthystring(include_synonyms) include_synonyms = include_synonyms is None or etiquette.helpers.truthystring(include_synonyms)