From 535ba0f64afe85bc2015a3c3f9ae90860f0e8fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Charette?= Date: Mon, 5 Nov 2007 07:16:10 +0000 Subject: [PATCH] fix first part of issue #1280 svn: r9296 --- ChangeLog | 5 +++++ src/plugins/NarrativeWeb.py | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84d491db7..1ec5ef6b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-04 Stéphane Charette + * src/plugins/NarrativeWeb.py: Fix first problem described in issue + #1280 (HTTP 404 errors due to source references on media pages); there + is still a serious problem for which I don't yet have a solution + 2007-11-04 Martin Hawlisch * src/gen/lib/Makefile.am * src/gen/db/Makefile.am diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index 31b570ff1..d51934b8d 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -1071,6 +1071,9 @@ class MediaPage(BasePage): photo.gramps_id) of = self.create_link_file(handle,"img") + self.db = db + self.src_list = src_list + mime_type = photo.get_mime_type() if mime_type: @@ -1191,8 +1194,6 @@ class MediaPage(BasePage): self.close_file(of) def display_media_sources(self, of, db, photo): - self.db = db - self.src_list = {} self.bibli = Bibliography() for sref in photo.get_source_references(): self.bibli.add_reference(sref) @@ -2498,9 +2499,9 @@ class WebReport(Report): self.person_pages(ind_list, place_list, source_list, archive) self.surname_pages(ind_list, archive) self.place_pages(place_list, source_list, archive) - self.source_pages(source_list, self.photo_list, archive) if self.inc_gallery: self.gallery_pages(self.photo_list, source_list, archive) + self.source_pages(source_list, self.photo_list, archive) if archive: archive.close()