diff --git a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue index ebeff6a63ad68943daabcf8eaa02fc21f0ee893b..cf9bba5dc5027d3c3c303714576b2c621b452560 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 48bb9665761f72eb2de40b7321bfad97563e758b..ec155b7f3acfe4bc93a3e3fbe3fd0ea61a5f51ba 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