launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/launchpad/localpackagediffs-mouse-pointer-bug-815788 into lp:launchpad with lp:~allenap/launchpad/localpackagediffs-filter-by-person-or-team-bug-798873-ui as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #815788 in Launchpad itself: "Mouse pointer does not change to a hand when over the "Package-sets" table heading on +localpackagediffs and its cousins"
  https://bugs.launchpad.net/launchpad/+bug/815788

For more details, see:
https://code.launchpad.net/~allenap/launchpad/localpackagediffs-mouse-pointer-bug-815788/+merge/69820

This branch does three small things in the
lp.registry.distroseries.differences JavaScript module:

- Changes linkify() to set href:

+    /* Set the href so that the visual display is consistent with
+       other links (cursor most notably). */

- Now that the links produced by linkify() have hrefs, the events
  produced by click have to be halted once we've done our thing.

- The test suite was failing because it was looking for the LP
  global. I've added this to the test case set up and tear down.

-- 
https://code.launchpad.net/~allenap/launchpad/localpackagediffs-mouse-pointer-bug-815788/+merge/69820
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/launchpad/localpackagediffs-mouse-pointer-bug-815788 into lp:launchpad.

=== modified file 'lib/lp/registry/javascript/distroseries/differences.js'
--- lib/lp/registry/javascript/distroseries/differences.js	2011-07-29 15:33:49 +0000
+++ lib/lp/registry/javascript/distroseries/differences.js	2011-07-29 15:33:56 +0000
@@ -89,7 +89,10 @@
  *
  */
 var linkify = function(node) {
-    var link = Y.Node.create('<a class="js-action sprite edit" />');
+    /* Set the href so that the visual display is consistent with
+       other links (cursor most notably). */
+    var link = Y.Node.create(
+        '<a href="#" class="js-action sprite edit" />');
     link.set("innerHTML", node.get("innerHTML"));
     node.empty().append(link);
     return link;
@@ -194,8 +197,10 @@
     overlay.after("visibleChange", initialize_picker);
 
     /* Linkify the origin and show the overlay when it's clicked. */
-    var link = linkify(origin);
-    link.on("click", function() { overlay.show(); });
+    linkify(origin).on("click", function(e) {
+        e.halt();
+        overlay.show();
+    });
 };
 
 
@@ -257,7 +262,10 @@
     });
 
     /* Linkify the origin and show the picker when it's clicked. */
-    linkify(origin).on("click", function(e) { picker.show(); });
+    linkify(origin).on("click", function(e) {
+        e.halt();
+        picker.show();
+    });
 
     return picker;
 };

=== modified file 'lib/lp/registry/javascript/distroseries/tests/test_differences.js'
--- lib/lp/registry/javascript/distroseries/tests/test_differences.js	2011-07-29 15:33:49 +0000
+++ lib/lp/registry/javascript/distroseries/tests/test_differences.js	2011-07-29 15:33:56 +0000
@@ -85,6 +85,9 @@
             Assert.areSame(link, target.one("a"));
             Assert.areSame("Foobar", link.get("text"));
             Assert.isTrue(link.hasClass("js-action"));
+            var href = link.get("href");
+            Assert.isString(href);
+            Assert.isTrue(href.length > 0);
         }
 
     };
@@ -95,6 +98,11 @@
         name: "TestLastChangedPicker",
 
         setUp: function() {
+            window.LP = {
+                links: {
+                    me: "~foobar"
+                }
+            };
             var body = Y.one(document.body);
             this.form = Y.Node.create("<form />").appendTo(body);
             this.origin = Y.Node.create("<div>Origin</div>").appendTo(body);
@@ -106,6 +114,7 @@
             this.picker.get("boundingBox").remove(true);
             this.origin.remove(true);
             this.form.remove(true);
+            delete window.LP;
         },
 
         test_linkify_click_activates_picker: function() {

=== modified file 'lib/lp/soyuz/adapters/notification.py'
--- lib/lp/soyuz/adapters/notification.py	2011-07-29 09:18:07 +0000
+++ lib/lp/soyuz/adapters/notification.py	2011-07-29 15:33:56 +0000
@@ -228,6 +228,7 @@
 
     build_and_send_mail(action, recipients)
 
+<<<<<<< TREE
     info = fetch_information(spr, bprs, changes)
     from_addr = info['changedby']
     if announce_from_person is not None:
@@ -235,6 +236,15 @@
         if email:
             from_addr = email.email
 
+=======
+    (changesfile, date, from_addr, maintainer) = fetch_information(
+        spr, bprs, changes)
+    if announce_from_person is not None:
+        email = announce_from_person.preferredemail
+        if email:
+            from_addr = email.email
+
+>>>>>>> MERGE-SOURCE
     # If we're sending an acceptance notification for a non-PPA upload,
     # announce if possible. Avoid announcing backports, binary-only
     # security uploads, or autosync uploads.