summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--expo/models.py2
-rw-r--r--settings.py2
-rw-r--r--templates/caveindex.html4
3 files changed, 5 insertions, 3 deletions
diff --git a/expo/models.py b/expo/models.py
index 79dbfbd..b3a7f5b 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -305,7 +305,7 @@ class Cave(models.Model):
href = self.unofficial_number
else:
href = official_name.lower()
- return settings.URL_ROOT + '/cave/' + self.href + '/'
+ return settings.URL_ROOT + '/cave/' + href + '/'
def __unicode__(self):
diff --git a/settings.py b/settings.py
index c2b62b9..8250176 100644
--- a/settings.py
+++ b/settings.py
@@ -77,6 +77,8 @@ INSTALLED_APPS = (
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.redirects',
+ 'photologue',
+ 'troggle.reversion',
'troggle.registration',
'troggle.profiles',
'troggle.expo'
diff --git a/templates/caveindex.html b/templates/caveindex.html
index d9e4748..3132701 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -8,14 +8,14 @@
<h3>Notable caves</h3>
<ul>
{% for cave in notablecaves %}
- <li> <a href="{{ cave.get_absolute_url }}">{{cave.official_name|wiki_to_html_short}} ({{cave.href}})</a> </li>
+ <li> <a href="{{ cave.get_absolute_url }}">{{cave.official_name|wiki_to_html_short}} ({{cave}})</a> </li>
{% endfor %}
</ul>
<h3>All caves</h3>
<ul>
{% for cave in caves %}
- <li> <a href="{{ cave.get_absolute_url }}">{{cave.official_name|wiki_to_html_short}} ({{cave.href}})</a> </li>
+ <li> <a href="{{ cave.get_absolute_url }}">{{cave.official_name|wiki_to_html_short}} ({{cave}})</a> </li>
{% endfor %}
</ul>