From d5f6ffe84b970451a5c4e82ef05e9bdacb8fb2cd Mon Sep 17 00:00:00 2001 From: Terrtia Date: Fri, 22 Nov 2019 15:34:56 +0100 Subject: [PATCH] fix: [correlation] merge conflict --- var/www/blueprints/correlation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/var/www/blueprints/correlation.py b/var/www/blueprints/correlation.py index 0adcebba..dacc4bca 100644 --- a/var/www/blueprints/correlation.py +++ b/var/www/blueprints/correlation.py @@ -18,7 +18,7 @@ import Flask_config # Import Role_Manager from Role_Manager import create_user_db, check_password_strength, check_user_role_integrity -from Role_Manager import login_admin, login_analyst, login_read_only +from Role_Manager import login_admin, login_analyst sys.path.append(os.path.join(os.environ['AIL_BIN'], 'lib')) import Correlate_object @@ -121,7 +121,7 @@ def get_card_metadata(object_type, correlation_id, type_id=None, expand_card=Fal # ============= ROUTES ============== @correlation.route('/correlation/show_correlation', methods=['GET', 'POST']) # GET + POST @login_required -@login_read_only +@login_analyst def show_correlation(): if request.method == 'POST': object_type = request.form.get('object_type') @@ -197,7 +197,7 @@ def show_correlation(): @correlation.route('/correlation/graph_node_json') @login_required -@login_read_only +@login_analyst def graph_node_json(): # # TODO: use post correlation_id = request.args.get('correlation_id') type_id = request.args.get('type_id')