diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:55:40 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:55:40 +0100 |
| commit | 24dc2e3a20de02c82d28e2125bb5bacdb7032a4d (patch) | |
| tree | 409a00dbd8def1da7ce785181351bf0e1c1be507 | |
| parent | 8916b460e1b915d1a3aa32b3691da67b753f652b (diff) | |
| download | troggle-24dc2e3a20de02c82d28e2125bb5bacdb7032a4d.tar.gz troggle-24dc2e3a20de02c82d28e2125bb5bacdb7032a4d.tar.bz2 troggle-24dc2e3a20de02c82d28e2125bb5bacdb7032a4d.zip | |
[svn] Fixing what I broke.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8256 by aaron @ 2/23/2009 1:05 PM
| -rw-r--r-- | expo/models.py | 2 | ||||
| -rw-r--r-- | settings.py | 2 | ||||
| -rw-r--r-- | templates/caveindex.html | 4 |
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>
|