From 75bba28a7c739002c1a8412914e10f3506bea86d Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 9 Feb 2015 16:18:12 +0200 Subject: server/client: move rz_config to templates, fill in to match server config host/post --- src/server/rz_api.py | 12 ++++++++++++ src/server/rz_server.py | 1 + 2 files changed, 13 insertions(+) (limited to 'src/server') diff --git a/src/server/rz_api.py b/src/server/rz_api.py index 64f7e3e0..da52b4a2 100644 --- a/src/server/rz_api.py +++ b/src/server/rz_api.py @@ -8,6 +8,7 @@ from flask import escape from flask import render_template from flask import request from flask import session +from flask import Response import logging import traceback @@ -133,3 +134,14 @@ def index(): rz_username = escape(u_account.rz_username) return render_template('index.html', rz_username=rz_username) + +def rz_config(): + server_name = current_app.rz_config.SERVER_NAME + if ':' in server_name: + hostname, port = server_name.split(':') + else: + hostname, port = server_name, 80 + body = render_template('rz_config.js', hostname=hostname, port=port) + response = Response(body, status=200, mimetype='application/json') + + return response diff --git a/src/server/rz_server.py b/src/server/rz_server.py index dc4de679..4622b488 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -205,6 +205,7 @@ def init_rest_interface(cfg, flask_webapp): return wrapped_function rest_entry_set = [ + rest_entry('/rz_config.js', rz_api.rz_config, {'methods': ['GET']}), rest_entry('/feedback', rz_feedback.rest__send_user_feedback__email), rest_entry('/graph/clone', rz_api.rz_clone), rest_entry('/graph/diff-commit-set', rz_api.diff_commit__set), -- cgit v1.3.1