[Blends-commit] [SCM] website branch, master, updated. 05bccf857d1e9f9b46efdfcbbabf6e54ea7fc6c7

[Andreas Tille]

The following commit has been merged in the master branch:
commit 5f85339fca3f893042672c68cc7e3a9b6ae171c3
Author: Andreas Tille <tille at debian.org>
Date:   Tue Aug 6 15:08:03 2013 +0200

    Split maintainer into maintainer_email and maintainer_name (programmatically - seems to be the easier SQL query)

diff --git a/webtools/bugs_udd.py b/webtools/bugs_udd.py
index ba953b9..5b9d38c 100755
--- a/webtools/bugs_udd.py
+++ b/webtools/bugs_udd.py
@@ -206,6 +206,8 @@ def main():
                 sources['homepage']    = pkg['homepage']
                 sources['vcs_browser'] = pkg['vcs_browser']
                 (_name, _url) = email.Utils.parseaddr(pkg['maintainer'])
+                sources['maintainer_email'] = _url
+                sources['maintainer_name']  = to_unicode(_name)
                 sources['maintainer']  = MarkupString('<a href="mailto:%s">%s</a>' % (_url, to_unicode(_name)), pkg['source'], 'maintainer')
                 if pkg['status'] == 'depends':
                     sources['bugs'] = bugs[pkg['source']]['open']
@@ -230,7 +232,10 @@ def main():
                     sources['source']      = pkg['source']
                     sources['homepage']    = pkg['homepage']
                     sources['vcs_browser'] = pkg['vcs_browser']
-                    sources['maintainer']  = pkg['maintainer']
+                    (_name, _url) = email.Utils.parseaddr(pkg['maintainer'])
+                    sources['maintainer_email'] = _url
+                    sources['maintainer_name']  = to_unicode(_name)
+                    sources['maintainer']  = MarkupString('<a href="mailto:%s">%s</a>' % (_url, to_unicode(_name)), pkg['source'], 'maintainer')
                     sources['bugs']        = bugs[pkg['source']]['done']
                     bugs_data[task]['done_l'].append(pkg['source'])
                     bugs_data[task]['done']['sources'].append(sources)
diff --git a/webtools/templates/bugs_udd.xhtml b/webtools/templates/bugs_udd.xhtml
index 9636bff..d7d346c 100644
--- a/webtools/templates/bugs_udd.xhtml
+++ b/webtools/templates/bugs_udd.xhtml
@@ -108,7 +108,7 @@
                           <span py:otherwise=""><a href="$pkgbug['vcs_browser']">${vcslocation}</a></span>
 			</span>
                         <span class="bugsmaintainer" id="bugsmaintainer" py:choose="">
-                          <span py:when="pkgbug.has_key('maintainer')">${pkgbug['maintainer']}</span>
+                          <span py:when="pkgbug.has_key('maintainer_email')"><a href="mailto:${pkgbug['maintainer_email']}">${pkgbug['maintainer_name']}</a></span>
                           <span py:otherwise="">unknown maintainer</span>
 			</span>
 		      </div>

-- 
Static and dynamic websites for Debian Pure Blends