diff --git a/voseq/core/templates/admin/public_interface/vouchers/batch_changes.html b/voseq/core/templates/admin/public_interface/vouchers/batch_changes.html index 596f0aa9..39bf326f 100644 --- a/voseq/core/templates/admin/public_interface/vouchers/batch_changes.html +++ b/voseq/core/templates/admin/public_interface/vouchers/batch_changes.html @@ -51,7 +51,7 @@

Specify the values for the fields you want to change

Type species? - {{ form.typeSpecies }} + {{ form.type_species }} Sex: {{ form.sex }} diff --git a/voseq/public_interface/forms.py b/voseq/public_interface/forms.py index 336fda3b..bcb38cb9 100644 --- a/voseq/public_interface/forms.py +++ b/voseq/public_interface/forms.py @@ -85,8 +85,8 @@ class AdvancedSearchForm(ModelSearchForm): subspecies = forms.CharField(label="Subspecies", max_length=100, required=False) country = forms.CharField(label="Country", max_length=100, required=False) specificLocality = forms.CharField(label="Specific Locality", max_length=250, required=False) - typeSpecies = forms.ChoiceField(label="Type species", choices=TYPE_SPECIES_CHOICES, - widget=forms.Select(attrs={'class': 'form-control'}), required=False) + type_species = forms.ChoiceField(label="Type species", choices=TYPE_SPECIES_CHOICES, + widget=forms.Select(attrs={'class': 'form-control'}), required=False) latitude = forms.FloatField(label="Latitude", required=False) longitude = forms.FloatField(label="Longitude", required=False) max_altitude = forms.IntegerField(label="Maximum altitude", required=False) @@ -263,7 +263,7 @@ class Meta: subspecies = forms.CharField(label="Subspecies", max_length=100, required=False) country = forms.CharField(label="Country", max_length=100, required=False) specificLocality = forms.CharField(label="Specific Locality", max_length=250, required=False) - typeSpecies = forms.ChoiceField(label="Type species", choices=TYPE_SPECIES_CHOICES, widget=forms.Select, required=False) + type_species = forms.ChoiceField(label="Type species", choices=TYPE_SPECIES_CHOICES, widget=forms.Select, required=False) latitude = forms.FloatField(label="Latitude", required=False) longitude = forms.FloatField(label="Longitude", required=False) max_altitude = forms.IntegerField(label="Maximum altitude", required=False) diff --git a/voseq/public_interface/search_indexes.py b/voseq/public_interface/search_indexes.py index 73ec74e3..02fc3d5c 100644 --- a/voseq/public_interface/search_indexes.py +++ b/voseq/public_interface/search_indexes.py @@ -103,7 +103,7 @@ class VouchersIndex(indexes.SearchIndex, indexes.Indexable): publishedIn = indexes.EdgeNgramField(model_attr='published_in', null=True) notes = indexes.EdgeNgramField(model_attr='notes', null=True) hostorg = indexes.CharField(model_attr='hostorg', null=True) - typeSpecies = indexes.CharField(model_attr='type_species', null=True) + type_species = indexes.CharField(model_attr='type_species', null=True) def get_model(self): return Vouchers diff --git a/voseq/public_interface/templates/public_interface/search.html b/voseq/public_interface/templates/public_interface/search.html index 8c5caa25..f10a899f 100644 --- a/voseq/public_interface/templates/public_interface/search.html +++ b/voseq/public_interface/templates/public_interface/search.html @@ -85,7 +85,7 @@

Search by taxonomy

{{ form.subtribe }} Type species? - {{ form.typeSpecies }} + {{ form.type_species }} diff --git a/voseq/public_interface/templates/public_interface/show_sequence.html b/voseq/public_interface/templates/public_interface/show_sequence.html index 451d20ff..2a050a6b 100644 --- a/voseq/public_interface/templates/public_interface/show_sequence.html +++ b/voseq/public_interface/templates/public_interface/show_sequence.html @@ -60,11 +60,11 @@

Sequence

Type Species: - {% if voucher.typeSpecies == 'd' %} + {% if voucher.type_species == 'd' %} don't know - {% elif voucher.typeSpecies == 'y' %} + {% elif voucher.type_species == 'y' %} yes - {% elif voucher.typeSpecies == 'n' %} + {% elif voucher.type_species == 'n' %} no {% endif %} diff --git a/voseq/public_interface/templates/public_interface/show_voucher.html b/voseq/public_interface/templates/public_interface/show_voucher.html index 6a210df7..31ac2a8b 100644 --- a/voseq/public_interface/templates/public_interface/show_voucher.html +++ b/voseq/public_interface/templates/public_interface/show_voucher.html @@ -106,7 +106,7 @@

Specimen name

Type species? - {{ voucher.typeSpecies }} + {{ voucher.type_species }} diff --git a/voseq/public_interface/templates/search/indexes/public_interface/vouchers_text.txt b/voseq/public_interface/templates/search/indexes/public_interface/vouchers_text.txt index 5e5a26fc..61e2b5f3 100644 --- a/voseq/public_interface/templates/search/indexes/public_interface/vouchers_text.txt +++ b/voseq/public_interface/templates/search/indexes/public_interface/vouchers_text.txt @@ -10,7 +10,7 @@ {{ object.subspecies }} {{ object.hostorg }} {{ object.author }} -{{ object.typeSpecies }} +{{ object.type_species }} {{ object.country }} {{ object.voucher }} {{ object.determinedBy }}