fix type_species

VoSeq · Sep 10, 2015 · f6578f0 · f6578f0
1 parent 0855e08
commit f6578f0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git 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 @@ <h3>Specify the values for the fields you want to change</h3>
                         <tr>
 
                             <td><b>Type species?</b></td>
-                            <td>{{ form.typeSpecies }}</td>
+                            <td>{{ form.type_species }}</td>
 
                             <td><b>Sex:</b></td>
                             <td>{{ form.sex }}</td>

diff --git 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
@@ -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
@@ -85,7 +85,7 @@ <h3 class="panel-title"><b>Search by taxonomy</b></h3>
               <td>{{ form.subtribe }}</td>
 
               <td><b>Type species?</b></td>
-              <td>{{ form.typeSpecies }}</td>
+              <td>{{ form.type_species }}</td>
             </tr>
           </table>
         </div><!-- panel -->

diff --git a/voseq/public_interface/templates/public_interface/show_sequence.html b/voseq/public_interface/templates/public_interface/show_sequence.html
@@ -60,11 +60,11 @@ <h3 class="panel-title"><b>Sequence</b></h3>
             <tr>
               <td><b>Type Species:</b></td>
               <td>
-                {% 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 %}
               </td>

diff --git a/voseq/public_interface/templates/public_interface/show_voucher.html b/voseq/public_interface/templates/public_interface/show_voucher.html
@@ -106,7 +106,7 @@ <h3 class="panel-title"><b>Specimen name</b></h3>
 
               <td><b>Type species?</b></td>
               <td>
-                {{ voucher.typeSpecies }}
+                {{ voucher.type_species }}
               </td>
             </tr>
           </table>

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
@@ -10,7 +10,7 @@
 {{ object.subspecies }}
 {{ object.hostorg }}
 {{ object.author }}
-{{ object.typeSpecies }}
+{{ object.type_species }}
 {{ object.country }}
 {{ object.voucher }}
 {{ object.determinedBy }}