fix for "AssertionError: View function mapping is overwriting..."

3 files changed, 13 insertions, 1 deletions

diff --git a/src/server/rz_api.py b/src/server/rz_api.py
index 84476633..9d4e49ca 100644
--- a/src/server/rz_api.py
+++ b/src/server/rz_api.py
@@ -15,6 +15,14 @@ from rz_api_common import sanitize_input__rzdoc_name
 log = logging.getLogger('rhizi')
 
 def index(rzdoc_name=None):
+    return rz_mainpage(rzdoc_name)
+
+def rz_mainpage(rzdoc_name=None):
+    """
+    Main application load function.
+
+    [!] Do not use as a flask endpoint as multiple functions redirect here
+    """
 
     # fetch rz_username for welcome message
     email_address = session.get('username')
diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py
index 2a47cad7..b486d227 100644
--- a/src/server/rz_api_rest.py
+++ b/src/server/rz_api_rest.py
@@ -25,6 +25,7 @@ from rz_req_handling import common_resp_handle__success, make_response__json, \
 from db_op import DBO_match_node_set_by_id_attribute, \
     DBO_load_link_set, DBO_match_node_id_set, DBO_diff_commit__topo
 from model.model import Link
+from rz_api import rz_mainpage
 
 
 log = logging.getLogger('rhizi')
@@ -184,6 +185,9 @@ def diff_commit__attr():
 def diff_commit__vis():
     pass
 
+def rzdoc__via_rz_url(rzdoc_name=None):
+    return rz_mainpage(rzdoc_name)
+
 @common_rest_req_exception_handler
 def rzdoc_clone():
 
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 95cf6807..23067895 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -235,7 +235,7 @@ def init_rest_interface(cfg, flask_webapp):
                       rest_entry('/signup', rz_user.rest__user_signup, {'methods': ['GET', 'POST']}),
 
                       # doc endpoints
-                      rest_entry('/rz/<path:rzdoc_name>', rz_api.index, {'methods': ['GET']}), # pretty URLs
+                      rest_entry('/rz/<path:rzdoc_name>', rz_api_rest.rzdoc__via_rz_url, {'methods': ['GET']}), # pretty URLs
                       rest_entry('/graph/clone', rz_api_rest.rzdoc_clone),
                       rest_entry('/rzdoc/list', rz_api_rest.rzdoc__list),
                       rest_entry('/rzdoc/<path:rzdoc_name>/create', rz_api_rest.rzdoc__create),