diff --git a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue index 11d5298b21a8cae2953030778501934c19fdf340..6f85ccc12c38b612760b86412e8f6f17a9622f1b 100644 --- a/frontend/src/components/unification/Unification/LexicalUnitEdit.vue +++ b/frontend/src/components/unification/Unification/LexicalUnitEdit.vue @@ -508,6 +508,7 @@ Object.assign(LexicalUnitEdit, { success: function (response) { show_info('Zunifikowana rama została zduplikowana.'); this.currentPreviewedUnifiedFrameId = response.unified_frame_id; + this.$emit('refreshEntriesList'); $.prompt.close(); }.bind(this), error: function (request, errorType, errorMessage) { diff --git a/frontend/src/components/unification/hierarchy/HierarchyEdit.vue b/frontend/src/components/unification/hierarchy/HierarchyEdit.vue index c19168dc0509c9337fd1a874cf4b6c677f7dc5c6..07878c46b48dad9d9e096e41eec705b0399c5374 100644 --- a/frontend/src/components/unification/hierarchy/HierarchyEdit.vue +++ b/frontend/src/components/unification/hierarchy/HierarchyEdit.vue @@ -417,7 +417,7 @@ export default HierarchyEdit; <tr style="background-color: white;"> <td id="change-title" @click="create_hyponym_or_hyperonym_relation(false)" style="padding: 10px 15px 10px 15px; color: #000000;">Nadrama</td> <td id="add-arg" @click="create_hyponym_or_hyperonym_relation(true)" style="padding: 10px 15px 10px 15px; color: #000000;">Podrama</td> - <td style="padding: 10px 15px 10px 15px; color: #000000;" @click="delete_hyponym_or_hyperonym_relation">Usiń powiązanie</td> + <td style="padding: 10px 15px 10px 15px; color: #000000;" @click="delete_hyponym_or_hyperonym_relation">Usuń powiązanie</td> <td style="padding: 10px 15px 10px 15px; color: #000000;" @click="goToEdit">Edytuj</td> </tr> </table> diff --git a/shellvalier/settings.py b/shellvalier/settings.py index 45be427ce3e3ded1e9a9240db05cc715f888dd1f..29a44e7a522627d23a448fe683b111ee7a542e3d 100644 --- a/shellvalier/settings.py +++ b/shellvalier/settings.py @@ -190,4 +190,4 @@ SUPER_LEXICOGRAPHS_GROUP_NAME = 'Super Leksykografowie' DATE_INPUT_FORMATS = ['%d-%m-%Y'] UNIFIED_FRAME_SERVICE_URL = get_environment('UNIFIED_FRAME_SERVICE_URL', - default="http://127.0.0.1:8000/en/unifier/build_unified_frame_xml/?lu_id=") + default="http://127.0.0.1:8000/en/unifier/build_unified_frame_xml/?frame_id=") diff --git a/syntax/management/commands/import_tei.py b/syntax/management/commands/import_tei.py index 4f8faa2412da0b63c1d971a2238aa6f2549dea0e..891710519c5c91c2dd8621d9ccef582e4de6f685 100644 --- a/syntax/management/commands/import_tei.py +++ b/syntax/management/commands/import_tei.py @@ -188,13 +188,16 @@ def import_semantic_roles(): (150, u'Time', u'242,236,54', None), (160, u'Duration', u'233,192,6', None), (170, u'Measure', u'238,72,154', None), - (180, u'Lemma', u'256,256,256', None) + (180, u'Lemma', u'256,256,256', None), + (190, u'Disponent', u'127,255,212', None), + (200, u'Means', u'pre', None) ] # priorities set so that, when role and attribute priorities are added, # Role_Source < Role_Foreground < Role_Background < Role_Goal # and Role can be inserted anywhere into that hierarchy attributes = [(1, u'Source', None, u'left'), (3, u'Foreground', None, u'top'), (5, u'Background', None, u'bottom'), - (7, u'Goal', None, u'right')] + (7, u'Goal', None, u'right'), (8, u'Source_Part', None, u'right'), + (9, u'Source_Attrib', None, u'right')] for pri, role, color, gradient in roles: role = SemanticRole(role=role, color=color, priority=pri) role.save() diff --git a/unifier/views.py b/unifier/views.py index 41a0d071caf5753d290cf819ac2254a1082dcc16..ce20416156067e3067681721e838528ad993bed8 100644 --- a/unifier/views.py +++ b/unifier/views.py @@ -347,6 +347,9 @@ def duplicate_unified_frame(request): unified_frame = UnifiedFrame.objects.get(id=unified_frame_id) new_frame = unified_frame.duplicate(new_frame_title=target_unified_frame_title) + + Assignment.assign(user=request.user, subject=new_frame) + return JsonResponse(get_unified_frame_json(new_frame, request)) return JsonResponse({})