From 97c8ee0bb10a55a1731d3a2be6f9cbf789b33ac7 Mon Sep 17 00:00:00 2001 From: Jonathan Karr Date: Sat, 18 Jul 2020 12:09:56 -0400 Subject: [PATCH] updating for obj_tables --- wc_lang/core.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wc_lang/core.py b/wc_lang/core.py index dcf1505..56e7b36 100644 --- a/wc_lang/core.py +++ b/wc_lang/core.py @@ -409,7 +409,7 @@ def validate(self, obj, value, tolerance=1E-10): # return None return None - def get_excel_validation(self, sheet_models=None, doc_metadata_model=None): + def get_xlsx_validation(self, sheet_models=None, doc_metadata_model=None): """ Get Excel validation Args: @@ -420,8 +420,8 @@ def get_excel_validation(self, sheet_models=None, doc_metadata_model=None): :obj:`wc_utils.workbook.io.FieldValidation`: validation """ sheet_models = sheet_models or [] - validation = super(ManyToManyAttribute, self).get_excel_validation(sheet_models=sheet_models, - doc_metadata_model=doc_metadata_model) + validation = super(ManyToManyAttribute, self).get_xlsx_validation(sheet_models=sheet_models, + doc_metadata_model=doc_metadata_model) related_class = Species if related_class in sheet_models: @@ -501,7 +501,7 @@ def evidence(self, *args): return self.get_or_create_model_obj(Evidence, **kwargs) - def get_excel_validation(self, sheet_models=None, doc_metadata_model=None): + def get_xlsx_validation(self, sheet_models=None, doc_metadata_model=None): """ Get Excel validation Args: @@ -512,8 +512,8 @@ def get_excel_validation(self, sheet_models=None, doc_metadata_model=None): :obj:`wc_utils.workbook.io.FieldValidation`: validation """ sheet_models = sheet_models or [] - validation = super(ManyToManyAttribute, self).get_excel_validation(sheet_models=sheet_models, - doc_metadata_model=doc_metadata_model) + validation = super(ManyToManyAttribute, self).get_xlsx_validation(sheet_models=sheet_models, + doc_metadata_model=doc_metadata_model) validation.ignore_blank = False @@ -560,7 +560,7 @@ def serialize(self, identifiers, encoded=None): sorted_ids = sorted(identifiers, key=lambda id: (id.namespace, id.id)) return ', '.join(id.serialize() for id in sorted_ids) - def get_excel_validation(self, sheet_models=None, doc_metadata_model=None): + def get_xlsx_validation(self, sheet_models=None, doc_metadata_model=None): """ Get Excel validation Args: @@ -570,8 +570,8 @@ def get_excel_validation(self, sheet_models=None, doc_metadata_model=None): Returns: :obj:`wc_utils.workbook.io.FieldValidation`: validation """ - validation = super(IdentifierToManyGrammarAttribute, self).get_excel_validation(sheet_models=sheet_models, - doc_metadata_model=doc_metadata_model) + validation = super(IdentifierToManyGrammarAttribute, self).get_xlsx_validation(sheet_models=sheet_models, + doc_metadata_model=doc_metadata_model) validation.ignore_blank = True input_message = ['Enter a comma-separated list of identifiers in external namespaces.']