diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-07-16 05:37:33 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-07-16 05:37:33 +0100 |
| commit | b9bbccfe00756f7cf825534252d5f94be244e621 (patch) | |
| tree | a664bce8b6e62ccf1568aa959507ad5a6224d545 /core | |
| parent | 05d262e42bf1a6c2e3cd0ee26d2bb17269135cf9 (diff) | |
| download | troggle-b9bbccfe00756f7cf825534252d5f94be244e621.tar.gz troggle-b9bbccfe00756f7cf825534252d5f94be244e621.tar.bz2 troggle-b9bbccfe00756f7cf825534252d5f94be244e621.zip | |
[svn] * Make descriptions parser also replace links to descriptions from Cave models' underground_descriptions with wikilinks for valid (existing) links
* Make entrances searchable in admin by cave kataster number
Diffstat (limited to 'core')
| -rw-r--r-- | core/admin.py | 5 | ||||
| -rw-r--r-- | core/templatetags/wiki_markup.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/admin.py b/core/admin.py index 438281e..fb3173a 100644 --- a/core/admin.py +++ b/core/admin.py @@ -100,6 +100,9 @@ class CaveAdmin(TroggleModelAdmin): inlines = (OtherCaveInline,)
extra = 4
+class EntranceAdmin(TroggleModelAdmin):
+ search_fields = ('caveandentrance__cave__kataster_number',)
+
admin.site.register(Photo)
admin.site.register(Cave, CaveAdmin)
admin.site.register(Area)
@@ -108,7 +111,7 @@ admin.site.register(CaveAndEntrance) admin.site.register(SurveyStation)
admin.site.register(NewSubCave)
admin.site.register(CaveDescription)
-admin.site.register(Entrance)
+admin.site.register(Entrance, EntranceAdmin)
admin.site.register(SurvexBlock, SurvexBlockAdmin)
admin.site.register(Expedition)
admin.site.register(Person,PersonAdmin)
diff --git a/core/templatetags/wiki_markup.py b/core/templatetags/wiki_markup.py index cf11358..31c5671 100644 --- a/core/templatetags/wiki_markup.py +++ b/core/templatetags/wiki_markup.py @@ -145,8 +145,8 @@ def wiki_to_html_short(value, autoescape=None): #make subcave links
value = re.sub("\[\[\s*subcave:(.+)\|(.+)\]\]",r'<a href="%s/subcave/\1/">\2</a>' % url_root, value, re.DOTALL)
#make cavedescription links
- value = re.sub("\[\[\s*cavedescription:(.+)\|(.+)\]\]",r'<a href="%s/cavedescription/\2/">\1</a>' % url_root, value, re.DOTALL)
-
+ value = re.sub("\[\[\s*cavedescription:(.+)\|(.+)\]\]",r'<a href="%s/cavedescription/\2/">\2</a>' % url_root, value, re.DOTALL)
+
#Make lists from lines starting with lists of [stars and hashes]
outValue = ""
|