Merge pull request #1244 from Signbank/api_interface

#1238: Added affiliation to retrieval API extended fields

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:

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