AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-30 01:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [correlation] merge conflict

Browse source
This commit is contained in:
Terrtia 2019-11-22 15:34:56 +01:00
parent 46f6f648a0
commit d5f6ffe84b
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
var/www/blueprints/correlation.py
View file

@ -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')