Skip to content

Commit

Permalink
fix: [correlation] merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Terrtia committed Nov 22, 2019
1 parent 46f6f64 commit d5f6ffe
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions var/www/blueprints/correlation.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# 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
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down

0 comments on commit d5f6ffe

Please sign in to comment.