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

[Edwin Grubbs]

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

[Edwin Grubbs (edwin-grubbs)]

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

[Paul Hummer (rockstar)]

review: Approve (code js)

=== 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 @@
         rel="meta" type="application/rdf+xml"
         title="FOAF" href="+rdf"
         />
-  <script type="text/javascript"
-          tal:content="string:
-    YUI().use('registry.team', function(Y) {
-        Y.on('load',
-             function(e) {
-                 Y.registry.team.setup_add_member_handler();
-             },
-             window);
-    });
-  "/>
   </tal:block>
 </head>
 

=== 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 @@
       <td style="padding: 0px 1em 1em 0px;"
           tal:define="link context/menu:overview/add_member"
           tal:condition="link/enabled">
+        <script type="text/javascript"
+                tal:content="string:
+          YUI().use('registry.team', function(Y) {
+              Y.on('load',
+                  function(e) {
+                      Y.registry.team.setup_add_member_handler();
+                  },
+                  window);
+          });
+        "/>
         <span id="add-member-spinner"
               class="unseen update-in-progress-message">
           Saving...