Merge lp:~jpds/launchpad/fix_196703 into lp:launchpad/db-devel

[Jonathan Davies]

Corrected mirror registration page to reflect reality about who owns a mirror and when it was first registered.

[Jonathan Davies (jpds)]

= Summary =

When one changes the owner of the mirror, the mirror page then says "Ubuntu mirror registered by the-new-owner.

This is incorrect. The original registrant and date should not be confused with who the current owner of the mirror registry entry is. This branch corrects this bug by changing the wording used.

[Brad Crittenden (bac)]

Hi Jonathan,

Thanks again for taking on this branch. It's an easy change but every bit helps and it gets you involved with Launchpad development.

The change looks good except for one thing: you need to update the test found in lib/lp/registry/browser/tests/distributionmirror-views.txt

It's always a good idea to run all of the tests in a particular area just to be sure you didn't miss something. You can do that like:

bin/test -vvm lp.registry | tee registry.out

Another big hint is submitting any patch that has not tests for it. That should be a big tip that you missed something.

review: Needs Fixing (code)

[Brad Crittenden (bac)]

Thanks for the test fix. It looks good now.

review: Approve (code)

=== modified file 'lib/lp/registry/browser/tests/distributionmirror-views.txt'
--- lib/lp/registry/browser/tests/distributionmirror-views.txt	2009-11-15 19:21:15 +0000
+++ lib/lp/registry/browser/tests/distributionmirror-views.txt	2009-12-04 20:23:27 +0000
@@ -359,7 +359,7 @@
 The page shows the mirror status
 
     >>> print extract_text(find_tag_by_id(content, 'status'))
-    Official Ubuntu Linux Mirror registered by Mark Shuttleworth ...
+    Official Ubuntu Linux mirror administered by Mark Shuttleworth, ...
 
 The page contains a source list...
 
 
=== modified file 'lib/lp/registry/templates/distributionmirror-index.pt'
--- lib/lp/registry/templates/distributionmirror-index.pt	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/templates/distributionmirror-index.pt	2009-12-04 20:23:27 +0000
@@ -20,8 +20,10 @@
       <strong>
         <tal:status replace="context/status/title">Official</tal:status>
       </strong>
-      <span tal:replace="context/distribution/title" /> Mirror registered by
-      <span tal:content="structure context/owner/fmt:link" />
+      <span tal:replace="context/distribution/title" /> mirror administered
+        by
+      <span tal:content="structure context/owner/fmt:link" />, first
+        registered
       <span tal:content="context/date_created/fmt:displaydate" />
     </p>