Merge lp:~intellectronica/launchpad/webkit-ajax-disables into lp:launchpad

[Eleanor Berger]

[Eleanor Berger (intellectronica)]

This branch has several simple fixes for the bug page:

1. The duplicate edit button now appears in webkit-based browsers.
2. The duplicate edit button is now positioned to the left of the action text, to fit with all other actions in the portlet.
3. The number of duplicates no longer displays in the actions portlet.
4. The product and assignee controls in the bugtask table are disabled in webkit-based browsers. Instead, a normal edit icon is dynamically added to the cells (a solution that's far from ideal but will have to do as a release-critical fix to allow users of those browsers edit the value).

[Graham Binns (gmb)]

review: Approve (code)

[Brad Crittenden (bac)]

Hi Tom,

As we discussed on IRC the problem seen with the project picker does not affect the assignee picker. Thanks for confirming and agreeing to revert the changes for the assignee.

--Brad

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-09-02 22:13:06 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-09-22 11:03:00 +0000
@@ -1227,15 +1227,23 @@
     if ((LP.client.links.me !== undefined) && (LP.client.links.me !== null))  {
         if (Y.Lang.isValue(bugtarget_content)) {
             if (conf.target_is_product) {
-                var bugtarget_picker = Y.lp.picker.addPickerPatcher(
-                    'Product',
-                    conf.bugtask_path,
-                    "target_link",
-                    bugtarget_content.get('id'),
-                    false,
-                    false,
-                    {"step_title": "Search products",
-                     "header": "Change product"});
+                if  (Y.UA.webkit) {
+                    bugtarget_content.replaceChild(
+                        Y.DOM.create(
+                            '<a href="+editstatus" ' +
+                            '   class="sprite edit yui-activator-act" />'),
+                        bugtarget_content.query('.yui-activator-act'));
+                } else {
+                    var bugtarget_picker = Y.lp.picker.addPickerPatcher(
+                        'Product',
+                        conf.bugtask_path,
+                        "target_link",
+                        bugtarget_content.get('id'),
+                        false,
+                        false,
+                        {"step_title": "Search products",
+                         "header": "Change product"});
+                 }
             }
         }
 
@@ -1359,18 +1367,26 @@
         milestone_choice_edit.render();        
     }
     if (Y.Lang.isValue(assignee_content)) {
-        var assignee_picker = Y.lp.picker.addPickerPatcher(
-            'ValidAssignee',
-            conf.bugtask_path,
-            "assignee_link",
-            assignee_content.get('id'),
-            true,
-            true,
-            {"step_title": "Search for people or teams",
-             "header": "Change assignee",
-             "remove_button_text": "Remove asignee",
-             "null_display_value": "Unassigned"});
-        assignee_picker.render()
+        if  (Y.UA.webkit) {
+            assignee_content.replaceChild(
+                Y.DOM.create(
+                    '<a href="+editstatus" ' +
+                    '   class="sprite edit yui-activator-act" />'),
+                assignee_content.query('.yui-activator-act'));
+        } else {
+            var assignee_picker = Y.lp.picker.addPickerPatcher(
+                'ValidAssignee',
+                conf.bugtask_path,
+                "assignee_link",
+                assignee_content.get('id'),
+                true,
+                true,
+                {"step_title": "Search for people or teams",
+                 "header": "Change assignee",
+                 "remove_button_text": "Remove asignee",
+                 "null_display_value": "Unassigned"});
+            assignee_picker.render()
+        }
     }
 };
 
 
=== removed file 'lib/lp/bugs/stories/duplicate-bug-handling/xx-bug-has-n-duplicates-message.txt'
--- lib/lp/bugs/stories/duplicate-bug-handling/xx-bug-has-n-duplicates-message.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/duplicate-bug-handling/xx-bug-has-n-duplicates-message.txt	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-A bug with duplicates shows a message of how many times it's been reported.
-
-    >>> user_browser.open("http://launchpad.dev/bugs/5")
-
-    >>> tag = find_tag_by_id(user_browser.contents, "number_of_dupes")
-    >>> print tag.renderContents()
-    (This bug has 1 duplicate)
 
=== modified file 'lib/lp/bugs/templates/bug-portlet-actions.pt'
--- lib/lp/bugs/templates/bug-portlet-actions.pt	2009-09-18 16:22:35 +0000
+++ lib/lp/bugs/templates/bug-portlet-actions.pt	2009-09-22 10:52:10 +0000
@@ -19,17 +19,19 @@
     <tal:block
       tal:condition="context/duplicates"
       tal:define="number_of_dupes context/duplicates/count"
-    ><span id="number_of_dupes">(This bug has
-    <tal:num-dupes condition="python:number_of_dupes == 1">1
-    duplicate)</tal:num-dupes>
-    <tal:num-dupes condition="python:number_of_dupes > 1"
-    content="string:${number_of_dupes} duplicates)"
-    >2 duplicates</tal:num-dupes></span>
+    >
     </tal:block>
     <tal:block
       tal:define="duplicateof context/duplicateof"
       tal:condition="duplicateof"
     >
+      <a
+        tal:define="link context_menu/markduplicate"
+        tal:condition="python: link.enabled"
+        id="change_duplicate_bug"
+        title="Edit or remove linked duplicate bug"
+        class="sprite edit"
+        tal:attributes="href link/url"></a>
       <span id="mark-duplicate-text">Duplicate of
       <a
         tal:condition="duplicateof/required:launchpad.View"
@@ -41,14 +43,6 @@
         <span
           tal:condition="not:duplicateof/required:launchpad.View"
           tal:replace="string:bug #${duplicateof/id}" />
-    <a
-      tal:define="link context_menu/markduplicate"
-      tal:condition="python: link.enabled"
-      id="change_duplicate_bug"
-      title="Edit or remove linked duplicate bug"
-      class="sprite edit"
-      tal:attributes="href link/url">
-    </a>
     </span>
     </tal:block>
   </div>