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
=== modified file 'lib/lp/registry/templates/team-index.pt'
--- lib/lp/registry/templates/team-index.pt 2009-12-17 04:17:12 +0000
+++ lib/lp/registry/templates/team-index.pt 2010-02-04 20:24:19 +0000
@@ -17,16 +17,6 @@
17 rel="meta" type="application/rdf+xml"17 rel="meta" type="application/rdf+xml"
18 title="FOAF" href="+rdf"18 title="FOAF" href="+rdf"
19 />19 />
20 <script type="text/javascript"
21 tal:content="string:
22 YUI().use('registry.team', function(Y) {
23 Y.on('load',
24 function(e) {
25 Y.registry.team.setup_add_member_handler();
26 },
27 window);
28 });
29 "/>
30 </tal:block>20 </tal:block>
31</head>21</head>
3222
3323
=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
--- lib/lp/registry/templates/team-portlet-membership.pt 2009-12-17 23:16:51 +0000
+++ lib/lp/registry/templates/team-portlet-membership.pt 2010-02-04 20:24:19 +0000
@@ -97,6 +97,16 @@
97 <td style="padding: 0px 1em 1em 0px;"97 <td style="padding: 0px 1em 1em 0px;"
98 tal:define="link context/menu:overview/add_member"98 tal:define="link context/menu:overview/add_member"
99 tal:condition="link/enabled">99 tal:condition="link/enabled">
100 <script type="text/javascript"
101 tal:content="string:
102 YUI().use('registry.team', function(Y) {
103 Y.on('load',
104 function(e) {
105 Y.registry.team.setup_add_member_handler();
106 },
107 window);
108 });
109 "/>
100 <span id="add-member-spinner"110 <span id="add-member-spinner"
101 class="unseen update-in-progress-message">111 class="unseen update-in-progress-message">
102 Saving...112 Saving...