diff --git a/entries/views.py b/entries/views.py index f23519f7dcc9a2129ab6a98926360ba6b6b13b87..c9486c9594fa62cc462d07018537a3219ad86582 100644 --- a/entries/views.py +++ b/entries/views.py @@ -21,7 +21,7 @@ from connections.models import Entry, Subentry, ArgumentConnection, RealisationD from meanings.models import LexicalUnit from syntax.models import NaturalLanguageDescription, Schema from semantics.models import Frame, PredefinedSelectionalPreference, SelectivePreferenceRelations, SemanticRole, \ - RoleAttribute, RoleSubAttribute + RoleAttribute, RoleSubAttribute, SelectionalPreferenceRelation from common.decorators import ajax_required, ajax from unifier.models import UnifiedFrame @@ -1060,7 +1060,7 @@ def ajax_role_sub_attributes(request): @ajax(method='get', encode_result=True) def ajax_relations(request): - relations = [{"id": relation.plwn_id, "content": relation.name} for relation in SelectivePreferenceRelations.objects.all()] + relations = [{"id": relation.id, "content": relation.key} for relation in SelectionalPreferenceRelation.objects.all()] context = { 'relations': relations, diff --git a/unifier/views.py b/unifier/views.py index 0ceda017ba082fe0bcf48ec576442ef047771971..307eb2027bcc376822f78c3f6d554e14285b7c45 100644 --- a/unifier/views.py +++ b/unifier/views.py @@ -208,9 +208,10 @@ def save_relational_selectional_preference(request): unified_frame_argument = UnifiedFrameArgument.objects.get(unified_frame_id=int(frame_id), id=int(complement_id_from)) - relational_selectional_preference = UnifiedRelationalSelectionalPreference(to_id=complement_id_to, + relational_selectional_preference, xx = UnifiedRelationalSelectionalPreference.objects.get_or_create(to_id=complement_id_to, relation_id=relation_id) relational_selectional_preference.save() + unified_frame_argument.relations.add(relational_selectional_preference) unified_frame_argument.save()