Launchpad itself

Merge lp:~edwin-grubbs/launchpad/bug-516071-setup_add_member_handler into lp:launchpad

  1. bug-516071-setup_add_member_handler
  2. Merge into devel
Proposed by Edwin Grubbs
Status: Merged
Approved by: Edwin Grubbs
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~edwin-grubbs/launchpad/bug-516071-setup_add_member_handler
Merge into: lp:launchpad
Diff against target: 41 lines (+10/-10)
2 files modified
lib/lp/registry/templates/team-index.pt (+0/-10)
lib/lp/registry/templates/team-portlet-membership.pt (+10/-0)
To merge this branch: bzr merge lp:~edwin-grubbs/launchpad/bug-516071-setup_add_member_handler
Reviewer Review Type Date Requested Status
Paul Hummer (community) code js Approve
Canonical Launchpad Engineering code Pending
Review via email: mp+18629@code.launchpad.net

Commit message

Fixed noncritical javascript error on team index page when the user is not a team admin.

To post a comment you must log in.
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

The team index page is generating a javascript error if a non-team-admin views the team index page, since the "Add member" link is not displayed, and it is trying to set its onclick handler.

I just moved the javascript which sets up the onclick handler inside the <td> that has a condition to check whether the "Add member" link is enabled.

./bin/test -vvt test_team_index --layer RegistryWindmillLayer

Revision history for this message
Paul Hummer (rockstar) :
review: Approve (code js)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/templates/team-index.pt'
2--- lib/lp/registry/templates/team-index.pt 2009-12-17 04:17:12 +0000
3+++ lib/lp/registry/templates/team-index.pt 2010-02-04 20:24:19 +0000
4@@ -17,16 +17,6 @@
5 rel="meta" type="application/rdf+xml"
6 title="FOAF" href="+rdf"
7 />
8- <script type="text/javascript"
9- tal:content="string:
10- YUI().use('registry.team', function(Y) {
11- Y.on('load',
12- function(e) {
13- Y.registry.team.setup_add_member_handler();
14- },
15- window);
16- });
17- "/>
18 </tal:block>
19 </head>
20
21
22=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
23--- lib/lp/registry/templates/team-portlet-membership.pt 2009-12-17 23:16:51 +0000
24+++ lib/lp/registry/templates/team-portlet-membership.pt 2010-02-04 20:24:19 +0000
25@@ -97,6 +97,16 @@
26 <td style="padding: 0px 1em 1em 0px;"
27 tal:define="link context/menu:overview/add_member"
28 tal:condition="link/enabled">
29+ <script type="text/javascript"
30+ tal:content="string:
31+ YUI().use('registry.team', function(Y) {
32+ Y.on('load',
33+ function(e) {
34+ Y.registry.team.setup_add_member_handler();
35+ },
36+ window);
37+ });
38+ "/>
39 <span id="add-member-spinner"
40 class="unseen update-in-progress-message">
41 Saving...