diff --git a/signbank/api_interface.py b/signbank/api_interface.py index 63e45631d..3282945bb 100644 --- a/signbank/api_interface.py +++ b/signbank/api_interface.py @@ -62,13 +62,14 @@ def api_fields(dataset, language_code='en', advanced=False): api_fields_2023.append(_("Link")) api_fields_2023.append(_("Video")) api_fields_2023.append(_("Tags")) + api_fields_2023.append(_("Affiliation")) fieldnames = FIELDS['main'] + FIELDS['phonology'] + FIELDS['semantics'] + ['inWeb', 'isNew', 'excludeFromEcv'] gloss_fields = [Gloss.get_field(fname) for fname in fieldnames if fname in Gloss.get_field_names()] # TO DO extra_columns = ['Sign Languages', 'Dialects', 'Sequential Morphology', 'Simultaneous Morphology', - 'Blend Morphology', 'Relations to other signs', 'Relations to foreign signs', 'Tags', 'Notes'] + 'Blend Morphology', 'Relations to other signs', 'Relations to foreign signs', 'Notes'] # show advanced properties for field in gloss_fields: diff --git a/signbank/dictionary/models.py b/signbank/dictionary/models.py index 94ee9eeb8..6c7a2839a 100755 --- a/signbank/dictionary/models.py +++ b/signbank/dictionary/models.py @@ -1494,6 +1494,16 @@ def get_fields_dict(self, fieldnames, language_code='en'): tag_names_of_gloss = sorted(tag_names_of_gloss) fields[tags_fieldname] = tag_names_of_gloss + affiliation_fieldname = gettext("Affiliation") + affiliations_of_gloss = AffiliatedGloss.objects.filter(gloss_id=self.id) + if affiliation_fieldname in fieldnames: + affiliation_names_of_gloss = [] + for aff_obj in affiliations_of_gloss: + aff_name = Affiliation.objects.get(id=aff_obj.affiliation.id) + affiliation_names_of_gloss += [aff_name.acronym] + affiliation_names_of_gloss = sorted(affiliation_names_of_gloss) + fields[affiliation_fieldname] = affiliation_names_of_gloss + return fields @staticmethod