archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Temporary tweak to join mechanism

Browse Source 
TODO: move this to the external app (blender-cloud).
This commit is contained in:
Francesco Siddi 2016-11-30 15:57:11 +01:00
parent 48ebdf11b3
commit e72f02711d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pillar/web/main/routes.py
View File

@ -271,6 +271,12 @@ def error_403():
return render_template('errors/403_embed.html') return render_template('errors/403_embed.html')
@blueprint.route('/join-agent')
def join_agent():
"""Custom page to support Agent 327 barbershop campaign"""
return render_template('join.html')
# Shameful redirects # Shameful redirects
@blueprint.route('/p/blender-cloud/') @blueprint.route('/p/blender-cloud/')
def redirect_cloud_blog(): def redirect_cloud_blog():

6
src/templates/projects/view.jade
View File

@ -361,7 +361,13 @@ script.
if (nodeId.substring(0, 2) == 'n_') { if (nodeId.substring(0, 2) == 'n_') {
nodeId = nodeId.substr(2); nodeId = nodeId.substr(2);
} }
{% if subscription not in ['demo', 'subscriber', 'admin'] and project.url == 'agent-327' %}
var url = '/join-agent';
{% else %}
var url = '/nodes/' + nodeId + '/view'; var url = '/nodes/' + nodeId + '/view';
// var url = '/join-agent';
{% endif %}
loadNodeContent(url, nodeId); loadNodeContent(url, nodeId);
// Determine whether we should push the new state or not. // Determine whether we should push the new state or not.