diff --git a/semantics/views.py b/semantics/views.py index 8e7a313296351b695e7d62a489dce3aeb8c6edde..efac9c0404f2cf454f423947cd11c1b91d3b11a7 100644 --- a/semantics/views.py +++ b/semantics/views.py @@ -32,7 +32,8 @@ def frame_confirm_invalid(request, frame_pk): removeSlovalFrameMappingsAndAssigments(frame_pk) http = urllib3.PoolManager() - r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk)) + r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) + + settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG) return {} @@ -47,7 +48,8 @@ def frame_reject_invalid(request, frame_pk): removeSlovalFrameMappingsAndAssigments(frame_pk) http = urllib3.PoolManager() - r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk)) + r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) + + settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG) return {} @@ -62,7 +64,8 @@ def frame_mark_as_bad(request, frame_pk): removeSlovalFrameMappingsAndAssigments(frame_pk) http = urllib3.PoolManager() - r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk)) + r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) + + settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG) return {} @@ -98,7 +101,8 @@ def frame_confirm_as_not_matching_unified_frame(request, frame_pk): removeSlovalFrameMappingsAndAssigments(frame_pk) http = urllib3.PoolManager() - r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk)) + r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(frame_pk) + + settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG) return {} diff --git a/shellvalier/settings.py b/shellvalier/settings.py index 8ea5d4c3bae36cf19dfa07f39370f14b9814bfbb..3374a76bc89b4278eb911c385750672af57837a8 100644 --- a/shellvalier/settings.py +++ b/shellvalier/settings.py @@ -196,3 +196,5 @@ SLOWAL_FRAME_REMOVE_SERVICE_URL = get_environment('SLOWAL_FRAME_REMOVE_SERVICE_U default='http://walentygroupies.ipipan.waw.pl/ajax/frame_statuses_free/?unifier_frame_ids=') SLOWAL_FRAME_TAKE_SERVICE_URL = get_environment('SLOWAL_FRAME_TAKE_SERVICE_URL', default='http://walentygroupies.ipipan.waw.pl/ajax/frame_statuses_take/?unifier_frame_ids=') +SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG = get_environment('SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG', + default='&system=valUnifier') diff --git a/unifier/views.py b/unifier/views.py index 5dd03ee7f42cd6fcae16a3572847495198b55ed7..f1318b475135928f357c3ff8a315d7da37c7da98 100644 --- a/unifier/views.py +++ b/unifier/views.py @@ -630,7 +630,8 @@ def create_unified_frame(frame_id): http = urllib3.PoolManager() - r = http.request('GET', settings.UNIFIED_FRAME_SERVICE_URL + str(frame_id)) + r = http.request('GET', settings.UNIFIED_FRAME_SERVICE_URL + str(frame_id) + + settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG) response = r.data.decode('utf-8') @@ -778,7 +779,8 @@ def delete_unified_frame(request, unified_frame_id): if len(slowal_frames_ids) > 0: http = urllib3.PoolManager() - r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + slowal_frames_ids) + r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + slowal_frames_ids + + settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG) UnifiedFrame.objects.get(id=unified_frame_id).delete() @@ -955,7 +957,8 @@ def attach_lu_to_unified_frame(request): for frame in frames: http = urllib3.PoolManager() - r = http.request('GET', settings.SLOWAL_FRAME_TAKE_SERVICE_URL + str(frame.id)) + r = http.request('GET', settings.SLOWAL_FRAME_TAKE_SERVICE_URL + str(frame.id) + + settings.SLOWAL_FRAME_SERVICE_SYSTEM_TYPE_ARG) return JsonResponse({}) return JsonResponse({})