Merge lp:~leonardr/launchpad/get-field-uri into lp:launchpad

Proposed by Leonard Richardson
Status: Merged
Approved by: Robert Collins
Approved revision: 9493
Merge reported by: Leonard Richardson
Merged at revision: not available
Proposed branch: lp:~leonardr/launchpad/get-field-uri
Merge into: lp:launchpad
Diff against target: 71 lines
2 files modified
lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt (+14/-0)
lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt (+17/-0)
To merge this branch: bzr merge lp:~leonardr/launchpad/get-field-uri
Reviewer Review Type Date Requested Status
Paul Hummer (community) Approve
Review via email: mp+12344@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Leonard Richardson (leonardr) wrote :

This branch adds a new Javascript utility function, get_field_uri(). This function lets you get the URI to a field resource, given an entry resource and a field name.

In addition to unit tests of the new function, this branch adds two tests that make sure patch() works on a field resource.

This branch also gets rid of the client_parse_xml_entry method, which is not used within Launchpad and which was a bad idea in the first place.

You'll get one Javascript failure when running the Windmill tests, but that's a failure currently in trunk; it's not introduced by this branch.

Revision history for this message
Paul Hummer (rockstar) :
review: Approve
lp:~leonardr/launchpad/get-field-uri updated
9493. By Leonard Richardson

Merge from trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt'
2--- lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt 2009-09-28 12:59:33 +0000
3+++ lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt 2009-09-28 17:34:42 +0000
4@@ -6,6 +6,7 @@
5 >>> user_browser.open(
6 ... "http://launchpad.dev/ubuntu/warty/+source/mozilla/+packaging")
7
8+<<<<<<< TREE
9 >>> print_location(user_browser.contents)
10 Hierarchy: Ubuntu > 4.10 > ...mozilla... source package > Upstream links
11 Tabs:
12@@ -17,6 +18,19 @@
13 * Answers - http://answers.launchpad.dev/ubuntu/warty/+source/mozilla
14 Main heading: Upstream links for ...mozilla... source package in Warty
15
16+=======
17+ >>> print_location(user_browser.contents)
18+ Hierarchy: Ubuntu > 4.10 > ...mozilla... source package > Upstream links
19+ Tabs:
20+ * Overview (selected) - http://launchpad.dev/ubuntu/warty/+source/mozilla
21+ * Branches - http://code.launchpad.dev/ubuntu/warty/+source/mozilla
22+ * Bugs - http://bugs.launchpad.dev/ubuntu/warty/+source/mozilla
23+ * Blueprints - not linked
24+ * Translations - http://translations.launchpad.dev/ubuntu/warty/+source/mozilla
25+ * Answers - http://answers.launchpad.dev/ubuntu/warty/+source/mozilla
26+ Main heading: Upstream links for mozilla in Ubuntu Warty
27+
28+>>>>>>> MERGE-SOURCE
29 >>> print extract_text(
30 ... find_tags_by_class(user_browser.contents, 'informational')[0])
31 Launchpad doesn&#8217;t know which project and series this package
32
33=== modified file 'lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt'
34=== modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt'
35=== modified file 'lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt'
36--- lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2009-09-28 12:59:33 +0000
37+++ lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2009-09-28 17:34:42 +0000
38@@ -4,6 +4,7 @@
39
40 >>> user_browser.open(
41 ... "http://launchpad.dev/ubuntu/hoary/+source/pmount/+changelog")
42+<<<<<<< TREE
43 >>> print_location(user_browser.contents)
44 Hierarchy: Ubuntu > 5.04 > ...pmount... source package > Change log
45 Tabs:
46@@ -18,6 +19,22 @@
47
48 >>> print extract_text(
49 ... find_tag_by_id(user_browser.contents, 'changelogs'))
50+=======
51+ >>> print_location(user_browser.contents)
52+ Hierarchy: Ubuntu > 5.04 > ...pmount... source package > Change log
53+ Tabs:
54+ * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/pmount
55+ * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/pmount
56+ * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/pmount
57+ * Blueprints - not linked
58+ * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/pmount
59+ * Answers - http://answers.launchpad.dev/ubuntu/hoary/+source/pmount
60+ Main heading: Change logs for pmount in Ubuntu Hoary
61+
62+
63+ >>> print extract_text(
64+ ... find_tag_by_id(user_browser.contents, 'changelogs'))
65+>>>>>>> MERGE-SOURCE
66 This is a placeholder changelog for pmount 0.1-2
67 pmount (0.1-1) hoary; urgency=low
68 * Fix description (Malone #1)
69
70=== modified file 'lib/lp/translations/browser/configure.zcml'
71=== modified file 'lib/lp/translations/model/translationimportqueue.py'