rz_config: embed in index, remove as module

Still missing:
remove host/port, let client use same as url it was served on.
remove other flags no longer relevant.
better mapping of server config to avoid double work?

2 files changed, 1 insertions, 10 deletions

diff --git a/src/server/rz_api.py b/src/server/rz_api.py
index da52b4a2..eb1a21d1 100644
--- a/src/server/rz_api.py
+++ b/src/server/rz_api.py
@@ -8,7 +8,6 @@ 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
 
@@ -132,16 +131,9 @@ def index():
     if None != email_address:
         uid, u_account = current_app.user_db.lookup_user__by_email_address(email_address)
         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
+    return render_template('index.html', rz_username=rz_username, hostname=hostname, port=port)
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 4622b488..dc4de679 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -205,7 +205,6 @@ 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),