Merge lp:~bac/launchpad/bug-705594 into lp:launchpad

[Brad Crittenden]

[r=deryck][ui=none][bug=705594] Use the correct target when red-flashing JS errors on the bug page.

= Summary =

Redflash target for display_error is wrong in some cases.

== Proposed fix ==

Fix the target. Think about removing redflash in the future.

== Pre-implementation notes ==

Talk with Benji.

== Implementation details ==

As above.

== Tests ==

* None *

== Demo and Q/A ==

On lp.dev select 'link a related branch', search for a branch but don't
select it. Before selecting, kill the server so that the selection
fails. Look to see the correct target is flashed when the branch is
selected.

[Deryck Hodge (deryck)]

Simple and easy. Thanks for fixing this!

review: Approve (code js)

=== modified file 'lib/lp/bugs/javascript/bugtask_index.js'
--- lib/lp/bugs/javascript/bugtask_index.js	2011-01-14 12:50:23 +0000
+++ lib/lp/bugs/javascript/bugtask_index.js	2011-01-20 21:42:16 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2009 Canonical Ltd.  This software is licensed under the
+/* Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * Form overlay widgets and subscriber handling for bug pages.
@@ -183,8 +183,9 @@
             update_dupe_url = update_dupe_link.get('href');
             var mark_dupe_form_url = update_dupe_url + '/++form++';
 
-            var form_header = '<p>Marking this bug as a duplicate will, by default, ' +
-                              'hide it from search results listings.</p>';
+            var form_header = '<p>Marking this bug as a duplicate will,' +
+                              ' by default, hide it from search results ' +
+                              'listings.</p>';
 
             var has_dupes = Y.one('#portlet-duplicates');
             if (has_dupes !== null) {
@@ -228,7 +229,8 @@
         privacy_link = Y.one('#privacy-link');
 
         if (privacy_link) {
-            var privacy_link_url = privacy_link.getAttribute('href') + '/++form++';
+            var privacy_link_url = privacy_link.getAttribute('href') +
+              '/++form++';
             var privacy_div = Y.one('#privacy-text');
             var privacy_html = privacy_link.get('innerHTML') + ' ';
             privacy_div.set('innerHTML', privacy_html);
@@ -495,7 +497,8 @@
         var container = Y.one('#add-comment-form');
         var first_node = container.get('firstChild');
         duplicate_warning = Y.Node.create(
-            ['<div class="warning message" id="warning-comment-on-duplicate">',
+            ['<div class="warning message"',
+             'id="warning-comment-on-duplicate">',
              'Remember, this bug report is a duplicate. ',
              'Comment here only if you think the duplicate status is wrong.',
              '</div>'].join(''));
@@ -598,7 +601,8 @@
                             '    id="security-message"',
                             '>Security vulnerability</div>'
                         ].join('');
-                        security_message = Y.Node.create(security_message_html);
+                        security_message = Y.Node.create(
+                           security_message_html);
                         privacy_div.appendChild(security_message);
                     }
                 } else {
@@ -627,7 +631,8 @@
         link_branch_link.toggleClass('update-in-progress-message');
     };
     error_handler.showError = function(error_msg) {
-        Y.lp.app.errors.display_error(Y.one('.menu-link-addsubscriber'), error_msg);
+        Y.lp.app.errors.display_error(
+           Y.one('.menu-link-addbranch'), error_msg);
     };
 
     function get_branch_and_link_to_bug(data) {
@@ -669,7 +674,8 @@
         link_branch_link.toggleClass('update-in-progress-message');
     };
     error_handler.showError = function(error_msg) {
-        Y.lp.app.errors.display_error(Y.one('.menu-link-addsubscriber'), error_msg);
+        Y.lp.app.errors.display_error(
+           Y.one('.menu-link-addbranch'), error_msg);
     };
 
     // Call linkBranch() on the bug.
@@ -873,7 +879,8 @@
     if (all_subscribers.size() > 0) {
         all_subscribers.each(function(sub_link) {
             if (sub_link.getAttribute('id') != 'temp-username') {
-                // User's displayname is found via the link's "name" attribute.
+                // User's displayname is found via the link's "name"
+                // attribute.
                 var sub_link_name = sub_link.one('a').getAttribute('name');
                 nodes_by_name[sub_link_name] = sub_link;
                 if (sub_link.one('img.unsub-icon')) {
@@ -970,7 +977,8 @@
 
     // Set the click handler if adding a remove icon.
     if (subscription.can_be_unsubscribed_by_user()) {
-        var remove_icon = Y.one('#unsubscribe-icon-' + person.get('css_name'));
+        var remove_icon =
+          Y.one('#unsubscribe-icon-' + person.get('css_name'));
         remove_icon.on('click', function(e) {
             e.halt();
             unsubscribe_user_via_icon(e.target, subscription);
@@ -1223,7 +1231,8 @@
                         subscription_link, true, false);
                 }
 
-                // Handle the case where the subscriber's list displays "None".
+                // Handle the case where the subscriber's list displays
+                // "None".
                 var empty_subscribers = Y.one("#none-subscribers");
                 if (empty_subscribers) {
                     var parent = empty_subscribers.get('parentNode');
@@ -1349,7 +1358,8 @@
         return;
     }
 
-    if ((LP.client.links.me !== undefined) && (LP.client.links.me !== null))  {
+    if ((LP.client.links.me !== undefined) &&
+        (LP.client.links.me !== null))  {
         if (Y.Lang.isValue(bugtarget_content)) {
             if (conf.target_is_product) {
                 if  (Y.UA.webkit) {
@@ -1379,7 +1389,8 @@
                 title: 'Change status to',
                 items: conf.status_widget_items,
                 elementToFlash: status_content.get('parentNode'),
-                backgroundColor: tr.hasClass('highlight') ? '#FFFF99' : '#FFFFFF'
+                backgroundColor:
+                    tr.hasClass('highlight') ? '#FFFF99' : '#FFFFFF'
             });
             status_choice_edit.showError = function(err) {
               Y.lp.app.errors.display_error(null, err);
@@ -1411,7 +1422,8 @@
                 title: 'Change importance to',
                 items: conf.importance_widget_items,
                 elementToFlash: importance_content.get('parentNode'),
-                backgroundColor: tr.hasClass('highlight') ? '#FFFF99' : '#FFFFFF'
+                backgroundColor:
+                    tr.hasClass('highlight') ? '#FFFF99' : '#FFFFFF'
             });
             importance_choice_edit.showError = function(err) {
               Y.lp.app.errors.display_error(null, err);
@@ -1427,8 +1439,9 @@
                 });
                 // Set the inline form control's value, so that submitting
                 // it won't override the value we just set.
-                Y.one(document.getElementById(conf.prefix + '.importance')).set(
-                    'value', importance_choice_edit.get('value'));
+                Y.one(document.getElementById(
+                    conf.prefix + '.importance')).set(
+                        'value', importance_choice_edit.get('value'));
             });
             importance_choice_edit.plug({
                 fn: Y.lp.client.plugins.PATCHPlugin, cfg: {
@@ -1472,7 +1485,8 @@
                 document.getElementById(conf.prefix + '.milestone'));
             if (Y.Lang.isValue(inline_combo)) {
             inline_combo.set('value', null);
-                Y.Array.each(milestone_choice_edit.get('items'), function(item) {
+                Y.Array.each(
+                   milestone_choice_edit.get('items'), function(item) {
                     if (item.value == milestone_choice_edit.get('value')) {
                         inline_combo.all('option').each(function(opt) {
                             if (opt.get('innerHTML') == item.name) {
@@ -1710,7 +1724,8 @@
 function check_can_be_unsubscribed(subscription) {
     var error_handler = new LP.client.ErrorHandler();
     error_handler.showError = function (error_msg) {
-        Y.lp.app.errors.display_error(Y.one('.menu-link-addsubscriber'), error_msg);
+        Y.lp.app.errors.display_error(
+           Y.one('.menu-link-addsubscriber'), error_msg);
     };
 
     var config = {
@@ -1735,7 +1750,8 @@
                                 subscription.set('can_be_unsubscribed', true);
                                 add_temp_user_name(subscription);
                             } else {
-                                subscription.set('can_be_unsubscribed', false);
+                                subscription.set(
+                                   'can_be_unsubscribed', false);
                                 add_temp_user_name(subscription);
                             }
                         },
@@ -1747,7 +1763,8 @@
                 if (is_team) {
                     // Get a list of members to see if current user
                     // is a team member.
-                    var members = result.get('members_details_collection_link');
+                    var members = result.get(
+                       'members_details_collection_link');
                     lp_client.get(members, final_config);
                 } else {
                     subscription.set('can_be_unsubscribed', false);
@@ -1779,7 +1796,8 @@
 
     var error_handler = new LP.client.ErrorHandler();
     error_handler.showError = function(error_msg) {
-        Y.lp.app.errors.display_error(Y.one('.menu-link-addsubscriber'), error_msg);
+        Y.lp.app.errors.display_error(
+           Y.one('.menu-link-addsubscriber'), error_msg);
     };
 
     if (subscription.is_already_subscribed()) {
@@ -1916,8 +1934,9 @@
     Y.io(url, config);
 }
 
-}, "0.1", {"requires": ["base", "oop", "node", "event", "io-base", "json-parse",
-                      "substitute", "widget-position-ext", "lazr.formoverlay",
-                      "lazr.anim", "lazr.base", "lazr.overlay",
-                      "lazr.choiceedit", "lp.app.picker", "lp.client.plugins",
-                      "lp.bugs.subscriber", "lp.app.errors"]});
+}, "0.1", {"requires": ["base", "oop", "node", "event", "io-base",
+                        "json-parse", "substitute", "widget-position-ext",
+                        "lazr.formoverlay", "lazr.anim", "lazr.base",
+                        "lazr.overlay", "lazr.choiceedit", "lp.app.picker",
+                        "lp.client.plugins", "lp.bugs.subscriber",
+                        "lp.app.errors"]});