summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/models/caves.py2
-rw-r--r--core/models/survex.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/core/models/caves.py b/core/models/caves.py
index fcaf8d9..536ace8 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -459,7 +459,7 @@ class QM(TroggleModel):
comment=models.TextField(blank=True,null=True)
def __str__(self):
- return "%s %s" % (self.code(), self.grade)
+ return f'{self.nearest_station_name}, {self.code()}-{self.grade}'
def code(self):
if self.found_by:
diff --git a/core/models/survex.py b/core/models/survex.py
index 989b9a6..6b173a5 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -81,6 +81,11 @@ class SurvexStation(models.Model):
else:
return r
+ class Meta:
+ ordering = ('id',)
+ def __str__(self):
+ return self.name and str(self.name) or 'no name'
+
#
# Single SurvexBlock
#