Skip to content

Commit

Permalink
updating for obj_tables
Browse files Browse the repository at this point in the history
  • Loading branch information
jonrkarr committed Jul 18, 2020
1 parent b7c77fe commit 97c8ee0
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions wc_lang/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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

Expand Down Expand Up @@ -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:
Expand All @@ -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.']
Expand Down

0 comments on commit 97c8ee0

Please sign in to comment.