From 2cda62c603f4ee36f180da30b050fb4aafae017d Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Wed, 23 Aug 2006 01:09:54 +0000
Subject: [PATCH] * src/plugins/NarrativeWeb.py: show url when no description
 (#0000319)

svn: r7241
---
 gramps2/ChangeLog                   | 3 +++
 gramps2/src/plugins/NarrativeWeb.py | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 9132bbeab..9481c8f56 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2006-08-22  Brian Matherly  <brian@gramps-project.org>
+	* src/plugins/NarrativeWeb.py: show url when no description (#0000319)
+
 2006-08-22  Alex Roitman  <shura@gramps-project.org>
 	* src/Filters/Rules/Person/_IsDescendantFamilyOf.py: Rewrite.
 	* src/Filters/_FilterParser.py (startElement): Upgrade existing
diff --git a/gramps2/src/plugins/NarrativeWeb.py b/gramps2/src/plugins/NarrativeWeb.py
index 0e623c6c4..a661f9142 100644
--- a/gramps2/src/plugins/NarrativeWeb.py
+++ b/gramps2/src/plugins/NarrativeWeb.py
@@ -434,6 +434,8 @@ class BasePage:
         for url in urllist:
             uri = url.get_path()
             descr = url.get_description()
+            if not descr:
+                descr = uri
             of.write('<tr><td class="field">%d.</td>' % index)
             of.write('<td class="data"><a href="%s">%s</a>' % (uri,descr))
             of.write('</td></tr>\n')
@@ -2365,7 +2367,7 @@ class WebReportOptions(ReportOptions):
 
         df = GenericFilter()
         df.set_name(_("Descendant Families of %s") % name)
-        df.add_rule(Rules.Person.IsDescendantFamilyOf([gramps_id]))
+        df.add_rule(Rules.Person.IsDescendantFamilyOf([gramps_id,1]))
 
         ans = GenericFilter()
         ans.set_name(_("Ancestors of %s") % name)