From c9591bd5b4b678c82b88d654989a671bd1b6911d Mon Sep 17 00:00:00 2001
From: dcz <dcz@ipipan.waw.pl>
Date: Sat, 26 Aug 2023 22:30:18 +0200
Subject: [PATCH] Bugfix frame status change and rollback new role names.
---
.../components/unification/Unification/LexicalUnitEdit.vue | 3 ++-
unifier/views.py | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue
index ebeff6a..cf9bba5 100644
--- a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue
+++ b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue
@@ -305,7 +305,8 @@ Object.assign(LexicalUnitEdit, {
let subAttributesHTML = role_sub_attributes.map(subAttribute => {
return `<label><input type="radio" name="sub_attribute" value="${subAttribute.id}" /> ${subAttribute.sub_attribute}</label><br />`;
}).join("");
- const roleTypeHTML = ['required', 'typical'].map(type => {
+ // const roleTypeHTML = ['required', 'typical'].map(type => {
+ const roleTypeHTML = ['role', 'modifier'].map(type => {
return `<label><input type="radio" name="role_type" value="${type}" /> ${type}</label><br />`;
}).join("");
return '<div class="row">' +
diff --git a/unifier/views.py b/unifier/views.py
index 48bb966..ec155b7 100644
--- a/unifier/views.py
+++ b/unifier/views.py
@@ -33,6 +33,8 @@ from django.views.decorators.csrf import csrf_exempt
import urllib3
+from .choices import UnifiedFrameStatus
+
@ajax_required
@transaction.atomic
@@ -409,7 +411,7 @@ def change_slowal_frame_status(request):
frame.status = status
frame.save()
- if status == choices.FrameStatus.BAD or choices.FrameStatus.INVALID:
+ if status == FrameStatus.BAD or FrameStatus.INVALID:
http = urllib3.PoolManager()
r = http.request('GET', settings.SLOWAL_FRAME_REMOVE_SERVICE_URL + str(slowal_frame_id))
@@ -519,7 +521,7 @@ def change_unified_frame_status_to_ready(request):
if request.method == 'POST':
unified_frame_id = request.POST['unified_frame_id']
unified_frame = UnifiedFrame.objects.get(pk=unified_frame_id)
- unified_frame.status = choices.UnifiedFrameStatus.READY
+ unified_frame.status = UnifiedFrameStatus.READY
for mapping in unified_frame.unified_frame_2_slowal_frame.all():
mapping.verified = True
--
GitLab