summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/birds/admin.py2
-rw-r--r--app/jrnl/views.py4
-rw-r--r--app/sightings/admin.py1
-rw-r--r--app/sightings/models.py10
4 files changed, 7 insertions, 10 deletions
diff --git a/app/birds/admin.py b/app/birds/admin.py
index 50bd755..df0951a 100644
--- a/app/birds/admin.py
+++ b/app/birds/admin.py
@@ -36,7 +36,6 @@ class SightingAdmin(OSMGeoAdmin):
list_display = ('ap', 'location')
# options for OSM map Using custom ESRI topo map
lat, lon = get_latlon()
- print(lat, lon)
default_lon = lon
default_lat = lat
default_zoom = 13
@@ -86,7 +85,6 @@ class BirdSightingAdmin(OSMGeoAdmin):
)
# options for OSM map Using custom ESRI topo map
lat, lon = get_latlon()
- print(lat, lon)
default_lon = lon
default_lat = lat
default_zoom = 13
diff --git a/app/jrnl/views.py b/app/jrnl/views.py
index 253aa5e..59fff7a 100644
--- a/app/jrnl/views.py
+++ b/app/jrnl/views.py
@@ -9,7 +9,7 @@ from utils.views import PaginatedListView
from .models import Entry, HomepageCurrator
from locations.models import CheckIn, Country, Region
-from birds.models import BirdSighting
+from sightings.models import Sighting
class EntryList(PaginatedListView):
@@ -82,7 +82,7 @@ class EntryDetailView(DetailView):
def get_context_data(self, **kwargs):
context = super(EntryDetailView, self).get_context_data(**kwargs)
- context['wildlife'] = BirdSighting.objects.filter(location=self.get_object().location)
+ context['wildlife'] = Sighting.objects.filter(location=self.get_object().location).order_by('ap__apclass__kind')
return context
class EntryDetailViewTXT(EntryDetailView):
diff --git a/app/sightings/admin.py b/app/sightings/admin.py
index 196712a..9cd0fef 100644
--- a/app/sightings/admin.py
+++ b/app/sightings/admin.py
@@ -37,7 +37,6 @@ class SightingAdmin(OSMGeoAdmin):
list_display = ('ap', 'location')
# options for OSM map Using custom ESRI topo map
lat, lon = get_latlon()
- print(lat, lon)
default_lon = lon
default_lat = lat
default_zoom = 13
diff --git a/app/sightings/models.py b/app/sightings/models.py
index 9559d38..096fa03 100644
--- a/app/sightings/models.py
+++ b/app/sightings/models.py
@@ -27,11 +27,11 @@ ABA_CODES = (
)
KIND_LIST = (
- (1, 'Bird'),
- (2, 'Mammal'),
- (3, 'Reptile'),
- (4, 'Amphibian'),
- (5, 'Plant'),
+ (1, 'Birds'),
+ (2, 'Mammals'),
+ (3, 'Reptiles'),
+ (4, 'Amphibians'),
+ (5, 'Plants'),
)