From 99cdd223a15c4b2b3d416b174b9345862c48d2b8 Mon Sep 17 00:00:00 2001
From: Janis Streib <me@janis-streib.de>
Date: Wed, 26 Aug 2020 16:49:00 +0200
Subject: [PATCH] ADD: JS_MODS
---
middleware/config_sample.py | 5 +++++
middleware/net_suite/views.py | 18 +-----------------
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/middleware/config_sample.py b/middleware/config_sample.py
index b752395c0..efd8288a1 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 3b3d23f53..f71d3b72e 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'))
--
GitLab