Merge lp:~edwin-grubbs/launchpad/bug-555734-coc-oops into lp:launchpad

[Edwin Grubbs]

Fix oops on /codeofconduct page when a user has a gpg key but has not signed the CoC.

Summary
-------

Fixed bug where a template tried to access to user/gpg_keys
attribute as user/gpgkeys. I changed the template variable to
gpg_keys to make it more consistent with user/gpg_keys.

Tests
-----

./bin/test -vv -t coc-views.txt

Demo and Q/A
------------

* Run this sql to add a gpg key, since the bug only occured when
  a user had a gpg key but had not signed the CoC yet.

  INSERT INTO gpgkey (
        owner, keyid, fingerprint, active, algorithm, keysize)
  SELECT
    52,
    keyid,
    'ABCDEF0123456789ABCDDCBA0000111112345670',
    active,
    algorithm,
    keysize
  FROM gpgkey
  WHERE id = 1;

* Open http://launchpad.dev/codeofcontact
  * Log in as <email address hidden>
  * You should no longer get an oops.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/lp/registry/browser/tests/coc-views.txt'
--- lib/lp/registry/browser/tests/coc-views.txt	2009-11-13 13:06:50 +0000
+++ lib/lp/registry/browser/tests/coc-views.txt	2010-04-12 20:36:33 +0000
@@ -2,6 +2,9 @@
 Codes of conduct views
 ======================
 
+Signed code of conduct for a user
+---------------------------------
+
 The PersonCodeOfConductEditView controls ~person/+codesofconduct.  It displays
 the person's name in the page label.
 
@@ -10,3 +13,67 @@
     >>> view = create_initialized_view(geddy, '+codesofconduct')
     >>> print view.label
     Codes of Conduct for Geddy Lee
+
+
+Directions for signing code of conduct
+--------------------------------------
+
+If the user hasn't signed the code of conduct and does not have a GPG
+key registered, directions are shown.
+
+    >>> def print_coc_directions(content):
+    ...     ol = content.find('ol')
+    ...     if ol is not None:
+    ...         for index, li in enumerate(ol.findAll('li')):
+    ...             print '%s. %s' % ((index+1), extract_text(li))
+    >>> user = factory.makePerson()
+    >>> login_person(user)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.codeofconduct import ICodeOfConductSet
+    >>> from canonical.launchpad.testing.pages import (
+    ...     extract_text, find_tag_by_id)
+    >>> coc_set = getUtility(ICodeOfConductSet)
+    >>> view = create_initialized_view(coc_set, '+index', principal=user)
+    >>> print_coc_directions(find_tag_by_id(view.render(), 'maincontent'))
+    1. Register an OpenPGP key.
+    2. Download the current Code of Conduct.
+    3. Sign it!
+
+If the user hasn't signed the code of conduct but does have a GPG key
+registered, directions are shown with a message indicating that the
+first step can be skipped.
+
+    >>> _ignore = factory.makeGPGKey(user)
+    >>> view = create_initialized_view(coc_set, '+index', principal=user)
+    >>> print_coc_directions(find_tag_by_id(view.render(), 'maincontent'))
+    1. Register an OpenPGP key.
+       It appears you have already done this.
+       The key ... is registered on your account.
+       You can skip to the next step if you are not intending
+       on signing with a different key.
+    2. Download the current Code of Conduct.
+    3. Sign it!
+
+If the user has multiple keys, a count is shown.
+
+    >>> _ignore = factory.makeGPGKey(user)
+    >>> view = create_initialized_view(coc_set, '+index', principal=user)
+    >>> print_coc_directions(find_tag_by_id(view.render(), 'maincontent'))
+    1. Register an OpenPGP key.
+       It appears you have already done this.
+       2 keys are registered on your account.
+       You can skip to the next step if you are not intending
+       on signing with a different key.
+    2. Download the current Code of Conduct.
+    3. Sign it!
+
+If the user has already signed the code of conduct, no directions are shown.
+
+    >>> admin = getUtility(IPersonSet).getByEmail('[e-mail]')
+    >>> login_person(admin)
+    >>> view = create_initialized_view(coc_set, '+index', principal=admin)
+    >>> content = find_tag_by_id(view.render(), 'maincontent')
+    >>> print_coc_directions(content)
+    >>> print extract_text(content)
+    Ubuntu Codes of Conduct...
+    Congratulations, you have already signed the Ubuntu Code of Conduct...

=== modified file 'lib/lp/registry/templates/codeofconduct-list.pt'
--- lib/lp/registry/templates/codeofconduct-list.pt	2010-03-11 16:09:29 +0000
+++ lib/lp/registry/templates/codeofconduct-list.pt	2010-04-12 20:36:33 +0000
@@ -11,7 +11,7 @@
 <div metal:fill-slot="main"
      tal:define="user view/user;
                  is_ubuntu_coc_signer user/is_ubuntu_coc_signer|nothing;
-                 gpgkeys user/gpg_keys|nothing">
+                 gpg_keys user/gpg_keys|nothing">
 
       <h1>Ubuntu Codes of Conduct</h1>
       <p>
@@ -32,20 +32,22 @@
         <ol style="margin-left: 4em">
             <li>
               <tal:logged_in condition="user">
-                 <a tal:attributes="href string:${user/fmt:url}/+editpgpkeys">Register
-                an OpenPGP key</a>.</tal:logged_in>
+                 <a tal:attributes="href string:${user/fmt:url}/+editpgpkeys">
+                 Register an OpenPGP key</a>.</tal:logged_in>
               <tal:not_logged_in tal:condition="not: user">
                 <a href="+login">Log in</a> and register an OpenPGP key.
               </tal:not_logged_in>
-              <p class="informational message" tal:condition="gpgkeys">
-                It appears you have already done this; 
+              <p tal:condition="gpg_keys"
+                 class="informational message"
+                 style="margin-top: 20px">
+                It appears you have already done this.
 
-                <tal:multiple_keys condition="python: gpgkeys.count() > 1">
-                <span tal:replace="user/gpgkeys/count" /> keys are
+                <tal:multiple_keys condition="python: gpg_keys.count() > 1">
+                <span tal:replace="gpg_keys/count" /> keys are
                 </tal:multiple_keys>
 
-                <tal:single_key condition="python: gpgkeys.count() == 1">
-                the key <code tal:content="python: gpgkeys[0].keyid" /> is
+                <tal:single_key condition="python: gpg_keys.count() == 1">
+                The key <code tal:content="python: gpg_keys[0].keyid" /> is
                 </tal:single_key>
 
                 registered on your account. You can skip to the next step if
@@ -54,15 +56,16 @@
               </p>
             </li>
             <li><a tal:attributes="href
-                string:${context/current_code_of_conduct/fmt:url}/+download">Download</a>
-                the current Code of Conduct.</li>
+                string:${context/current_code_of_conduct/fmt:url}/+download">
+                Download</a> the current Code of Conduct.</li>
             <li><a tal:attributes="href
-                string:${context/current_code_of_conduct/fmt:url}/+sign">Sign it!</a></li>
+                string:${context/current_code_of_conduct/fmt:url}/+sign">
+                Sign it!</a></li>
         </ol>
       </div>
 
       <p tal:condition="is_ubuntu_coc_signer">
-        Congratulations; you have already <a tal:attributes="href
+        Congratulations, you have already <a tal:attributes="href
         string:${user/fmt:url}/+codesofconduct">signed</a> the Ubuntu Code
         of Conduct.
       </p>
@@ -77,7 +80,7 @@
             </tal:not_current>
          </tal:codes>
       </ul>
-      
+
       <br />
       <p>
         <a tal:replace="structure context/menu:overview/admin/render" />