diff --git a/middleware/config_sample.py b/middleware/config_sample.py index b752395c0abb1ab3801e5972a09e20655b3fd59c..efd8288a17b918afd6c4a1f57b4aa163699ce0d4 100644 --- a/middleware/config_sample.py +++ b/middleware/config_sample.py @@ -30,6 +30,11 @@ LOGIN_URL = 'login_api.login' # moduels ans their 'mountpoints' MODULES = [] +JS_MODULES = [ + 'DNSVS', + 'MACAuth' +] + MINIDHCPVS_DB = 'mac_addrs' MINIDHCPVS_USER = 'lease_reader' MINIDHCPVS_HOST = 'host' diff --git a/middleware/net_suite/views.py b/middleware/net_suite/views.py index 3b3d23f531189eb6c5fa03f8a7a54cffc7b6c564..f71d3b72e36392c0a72dae2d245be11ec4f12e29 100644 --- a/middleware/net_suite/views.py +++ b/middleware/net_suite/views.py @@ -112,20 +112,4 @@ def handle_generic(e): @app.context_processor def inject_mods(): - current_mod = request.blueprint - if current_mod is not None: - for m in MODS: - if m.name == current_mod: - current_mod = m - break - search_opts = {} - try: - for m in MODS: - if m.search_func is None: - continue - search_opts[m.printable_name] = m.search_opts_func(login=request.environ['beaker.session']['login'], db=db, - connection=get_db_conn()) - except: - pass - return dict(mods=MODS, current_mod=current_mod, - s_opts=search_opts) + return dict(mods=MODS, local_mods=app.config.get('JS_MODULES'))