diff --git a/HBNet.png b/HBNet.png new file mode 100644 index 0000000..c670424 Binary files /dev/null and b/HBNet.png differ diff --git a/db.txt b/db.txt deleted file mode 100644 index d021f31..0000000 --- a/db.txt +++ /dev/null @@ -1,4 +0,0 @@ -{ - 3153597:b'passw0rd', - 1234567:b'password' -} diff --git a/user_managment/app.py b/user_managment/app.py index 54cdaee..7a0e837 100644 --- a/user_managment/app.py +++ b/user_managment/app.py @@ -1995,12 +1995,15 @@ def create_app(): ) db.session.add(add_system) db.session.commit() + + def delete_system_bridge(_name, _server): + dr = BridgeRules.query.filter_by(server=_server).filter_by(bridge_name=_name).all() + for i in dr: + db.session.delete(i) + db.session.commit() - def delete_system_rule(_name, _server): - print(_name) - print(_server) - - dr = BridgeRules.query.filter_by(server=_server).filter_by(bridge_name=_name).first() + def delete_system_rule(_name, _server, _system): + dr = BridgeRules.query.filter_by(server=_server).filter_by(bridge_name=_name).filter_by(system_name=_system).first() db.session.delete(dr) db.session.commit() @@ -4301,7 +4304,12 @@ def create_app(): elif request.args.get('save_rule') == 'delete': print(request.args.get('bridge')) print(request.args.get('server')) - delete_system_rule(request.args.get('bridge'), request.args.get('server')) + if request.args.get('system'): + delete_system_rule(request.args.get('bridge'), request.args.get('server'), request.args.get('system')) + else: + delete_system_bridge(request.args.get('bridge'), request.args.get('server')) + +## delete_system_rule(request.args.get('bridge'), request.args.get('server'), request.args.get('system')) content = 'deleted' elif request.args.get('add_rule'): @@ -4381,7 +4389,7 @@ def create_app(): - + 
 ----Delete SYSTEM Rule
diff --git a/user_managment/static/HBlink.png b/user_managment/static/HBlink.png deleted file mode 100644 index 29fa556..0000000 Binary files a/user_managment/static/HBlink.png and /dev/null differ