Skip to content

Commit

Permalink
views: alias routes
Browse files Browse the repository at this point in the history
  * Closes: cernopendata#1130
  * Addresses: cernopendata#2081

Signed-off-by: Ana Trisovic <ana.trisovic@gmail.com>
  • Loading branch information
atrisovic committed Dec 13, 2017
1 parent 84189f8 commit 58ff862
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions cernopendata/modules/pages/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def md_debug():


@blueprint.route('/visualise/events')
@blueprint.route('/visualize/events')
@register_breadcrumb(blueprint, '.visualise_events', _('Visualise Events'))
def visualise_events_landing():
"""Display landing page."""
Expand All @@ -122,7 +123,9 @@ def visualise_events_landing():


@blueprint.route('/visualise/events/<string:experiment>')
@blueprint.route('/visualize/events/<string:experiment>')
@blueprint.route('/visualise/events/<string:experiment>/<int:eventid>')
@blueprint.route('/visualize/events/<string:experiment>/<int:eventid>')
@register_breadcrumb(blueprint, '.visualise_events', _('Visualise Events'))
def visualise_events(experiment='cms', eventid=None):
"""Display visualisations."""
Expand All @@ -138,7 +141,9 @@ def visualise_events(experiment='cms', eventid=None):


@blueprint.route('/visualise/histograms')
@blueprint.route('/visualize/histograms')
@blueprint.route('/visualise/histograms/<string:experiment>')
@blueprint.route('/visualize/histograms/<string:experiment>')
@register_breadcrumb(blueprint, '.visualise_histograms',
_('Visualise Histograms'))
def visualise_histograms(experiment='cms'):
Expand Down Expand Up @@ -209,7 +214,7 @@ def about_cms_dataset_names():
@blueprint.route('/getting-started/<exp>')
def getting_started_redirect(exp):
"""Redirects to associated experiment."""
return redirect('/docs/%s-getting-started' % exp,
return redirect('/docs/{}-getting-started'.format(exp),
code=302)


Expand Down Expand Up @@ -266,10 +271,12 @@ def glossary_json():
return jsonify(glossary)


@blueprint.route('/<any("/visualise/histograms", "/visualize/histograms"):page>'
'/<any("cms","lhcb","opera","alice","atlas"):experiment>')
@blueprint.route('/collection/<string:collection>')
@blueprint.route('/<any("getting-started","vm","news",'
@blueprint.route('/<any("getting-started","getstarted","vm","news",'
'"datasets","documentation","software"):page>')
@blueprint.route('/<any("getting-started","vm"):page>'
@blueprint.route('/<any("getting-started","getstarted","vm"):page>'
'/<any("cms","lhcb","opera","alice","atlas"):experiment>')
def faceted_search(page=None, experiment=None, collection=None):
"""Faceted search view.
Expand All @@ -288,6 +295,7 @@ def faceted_search(page=None, experiment=None, collection=None):
'software': ('type', 'Software'),
'datasets': ('type', 'Dataset'),
'getting-started': ('tags', 'Getting Started'),
'getstarted': ('tags', 'Getting Started'),
'news': ('type', 'News'),
'vm': ('tags', 'VM'),
'cms': ('experiment', 'CMS'),
Expand Down

0 comments on commit 58ff862

Please sign in to comment.