Merge lp:~thumper/launchpad/client-cache-sync into lp:launchpad

[Tim Penhey]

[r=jcsackett][bug=490826,721064,724004] Keep LP.cache up to date with launchpadlib PATCH changes, and raise update events.

The primary focus of this branch is to keep the Javascript
cache of the context object up to date with API changes done
using the PATCH method. As much as possible this has been
pushed as low into the library code as possible to make sure
it just works.

As we are now updating the cache object, we know when fields
have changed. Now when fields change, we send YUI events.
One change is to implement a standard listener for when the
web_link attribute changes on the context object. If this
changes, it means that the object that we are editing or viewing
right now is now at a different location. We change the window's
location when this happens to take the user to the new page.
This happens now independently of how the web_link got changed,
whether that be a picker to change the owner, or editing a
different part of the URL (like a name).

The standard widgets were updated to support the changes to
the PATCHPlugin. The PATCHPlugin now always requests JSON
with the additional html representations. This change also
made the picker simpler, as it no longer had to work out
itself if the context object was being changed.

The branch also updates the source package recipe so the
base_branch and deb_version_template are exported.

[j.c.sackett (jcsackett)]

Tim--

This looks really excellent.

You might want to get one other heavier duty js person to take a look at this (and possibly your other branch, but that was mostly mechanical changes), but I think it looks solid.

review: Approve

[Francis J. Lacoste (flacoste)]

It would be nice to have some test coverage for these new facilities.

[Francis J. Lacoste (flacoste)]

> lib/lp/code/javascript/sourcepackagerecipe.index.js

Given that this only contains 2 lines of hook-up and is used only on one page, is it worth defining a YUI module for that? I'd suggest inlining the hook-up in the page itself.

=== removed directory 'lib/canonical/launchpad/javascript/client'
=== renamed file 'lib/canonical/launchpad/javascript/client/client.js' => 'lib/lp/app/javascript/client.js'
--- lib/canonical/launchpad/javascript/client/client.js	2011-02-24 22:10:32 +0000
+++ lib/lp/app/javascript/client.js	2011-02-28 01:12:51 +0000
@@ -1,11 +1,10 @@
-
-// An AJAX client that runs against Launchpad's web service.
-var LP = {
-  cache: {},
-  links: {}
-};
-
-
+/* Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * Utility methods and classes to deal with the Launchpad API using Javascript.
+ *
+ * @module Y.lp.client
+ */
 YUI.add('lp.client', function(Y) {
 
 var module = Y.namespace('lp.client');
@@ -179,17 +178,76 @@
     return data;
 };
 
+function update_cached_object(cache_name, cache, entry)
+{
+  var fields_changed = new Array();
+  for (var name in cache) {
+    var old_value = cache[name];
+    var new_value = entry.get(name);
+    if (name != 'lp_html') {
+      if (old_value != new_value) {
+        fields_changed.push(name);
+        cache[name] = new_value;
+        var field_updated_event_name = 'lp:' + cache_name + ':' + name + ':changed';
+        var event = {
+          'name': name,
+          'old_value': old_value,
+          'new_value': new_value,
+          'entry': entry
+        };
+        Y.fire(field_updated_event_name, event);
+      }
+    }
+    else {
+      // Since we don't care here about the content, we aren't using the
+      // values here to determine if the field has changed, so we can just
+      // update the cache.
+      for (var html_name in old_value) {
+        old_value[html_name] = new_value[html_name];
+      }
+    }
+  }
+
+  if (fields_changed.length > 0) {
+    var event_name = 'lp:' + cache_name + ':changed';
+    var event = {
+      'fields_changed': fields_changed,
+      'entry': entry
+    };
+    Y.fire(event_name, event);
+  }
+}
+
+
+module.update_cache = function(entry) {
+  if (!entry) return;
+  var original_uri = entry.lp_original_uri;
+  var full_uri = module.get_absolute_uri(original_uri);
+  for (var name in LP.cache) {
+    var cached_object = LP.cache[name];
+    if (cached_object['self_link'] == full_uri) {
+      Y.log(name + ' cached object has been updated.');
+      update_cached_object(name, cached_object, entry);
+    }
+  }
+}
+
 module.wrap_resource_on_success = function(ignore, response, args) {
     var client = args[0];
     var uri = args[1];
     var old_on_success = args[2];
+    var update_cache = args[3];
     var representation, wrapped;
     if (old_on_success) {
         var media_type = response.getResponseHeader('Content-Type');
         if (media_type.substring(0,16) == 'application/json') {
             representation = Y.JSON.parse(response.responseText);
             wrapped = client.wrap_resource(uri, representation);
-            return old_on_success(wrapped);
+            result = old_on_success(wrapped);
+            if (update_cache) {
+              module.update_cache(wrapped);
+            }
+            return result;
         } else {
             return old_on_success(response.responseText);
         }
@@ -390,6 +448,23 @@
     return this.get(key);
 };
 
+Entry.prototype.getHTML = function(key) {
+  var lp_html = this.get('lp_html');
+  if (lp_html) {
+    // First look for the key.
+    var value = lp_html[key];
+    if (value !== undefined) {
+      return value;
+    }
+    // now look for key_link
+    value = lp_html[key + '_link'];
+    if (value !== undefined) {
+      return value;
+    }
+  }
+  return null;
+};
+
 module.Entry = Entry;
 
 // The Launchpad client itself.
@@ -415,10 +490,11 @@
         }
 
         var old_on_success = on.success;
+        var update_cache = false;
         on.success = module.wrap_resource_on_success;
         var client = this;
         var y_config = { on: on,
-                         'arguments': [client, uri, old_on_success],
+                         'arguments': [client, uri, old_on_success, update_cache],
                          'headers': headers,
                          data: data};
         Y.io(uri, y_config);
@@ -463,9 +539,10 @@
             return module.wrap_resource_on_success(undefined, response, args);
         };
         var client = this;
+        var update_cache = false;
         var y_config = { method: "POST",
                          on: on,
-                         'arguments': [client, uri, old_on_success],
+                         'arguments': [client, uri, old_on_success, update_cache],
                          data: data};
         Y.io(uri, y_config);
     },
@@ -476,8 +553,9 @@
         uri = module.normalize_uri(uri);
 
         var old_on_success = on.success;
+        var update_cache = true;
         on.success = module.wrap_resource_on_success;
-        args = [this, uri, old_on_success];
+        args = [this, uri, old_on_success, update_cache];
 
         var extra_headers = {
                 "X-HTTP-Method-Override": "PATCH",
@@ -674,13 +752,13 @@
         resource: {},
 
         /**
-         * Is this a patch for only a field,
-         * not the entire resource object?
+         * Should the resulting field get the value from the lp_html
+         * attribute?
          *
-         * @attribute patch_field
+         * @attribute use_html
          * @type Boolean
          */
-        patch_field: false,
+        use_html: false,
 
         /**
          * The function to use to format the returned result into a form that
@@ -728,6 +806,7 @@
         // Save the config object that the user passed in so that we can pass
         // any extra parameters through to the lp.client constructor.
         this.extra_config = config || {};
+        this.extra_config['accept'] = 'application/json;include=lp_html';
 
         // Save a reference to the original _saveData()
         //method before wrapping it.
@@ -773,12 +852,8 @@
 
         var patch_payload;
         var val = owner.getInput();
-        if (this.get('patch_field')) {
-            patch_payload = val;
-        } else {
-            patch_payload = {};
-            patch_payload[attribute] = val;
-        }
+        patch_payload = {};
+        patch_payload[attribute] = val;
 
         var callbacks = {
             on: {
@@ -818,7 +893,11 @@
         if (Y.Lang.isString(result)) {
             return result;
         } else {
+          if (this.get('use_html')) {
+            return result.getHTML(attribute);
+          } else {
             return result.get(attribute);
+          }
         }
     }
 });

=== added file 'lib/lp/app/javascript/lp.ui.js'
--- lib/lp/app/javascript/lp.ui.js	1970-01-01 00:00:00 +0000
+++ lib/lp/app/javascript/lp.ui.js	2011-02-28 01:12:51 +0000
@@ -0,0 +1,20 @@
+/* Copyright 2011 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * Launchpad helper methods for generic UI stuff.
+ *
+ * @module Y.lp.ui
+ */
+YUI.add('lp.ui', function(Y) {
+
+    var module = Y.namespace('lp.ui');
+
+    module.update_field = function(selector, content)
+    {
+      var element = Y.one(selector);
+      element.set('innerHTML', content);
+      Y.lazr.anim.green_flash({node:element}).run();
+    }
+
+  }, "0.1", {"requires": ["node", "lazr.anim"]}
+);

=== modified file 'lib/lp/app/javascript/picker.js'
--- lib/lp/app/javascript/picker.js	2011-02-23 23:46:43 +0000
+++ lib/lp/app/javascript/picker.js	2011-02-28 01:12:51 +0000
@@ -40,9 +40,6 @@
     var null_display_value = 'None';
     var show_search_box = true;
     resource_uri = Y.lp.client.normalize_uri(resource_uri)
-    var full_resource_uri = Y.lp.client.get_absolute_uri(resource_uri);
-    var current_context_uri = LP.cache['context']['self_link'];
-    var editing_main_context = (full_resource_uri == current_context_uri);
 
     if (config !== undefined) {
         if (config.remove_button_text !== undefined) {
@@ -102,41 +99,13 @@
     var save = function (picker_result) {
         activator.renderProcessing();
         var success_handler = function (entry) {
-            // XXX mars 2009-12-1
-            // The approach we use here is deprecated.  Instead of requesting
-            // the entire entity we should only request the fields we need.
-            // Then most of this code can go away. See bug #490826.
-            var success_message_node = null;
-            var xhtml = Y.Node.create(entry);
-            var current_field = null;
-            var content_uri_has_changed = false;
-            // The entry is an XHTML document with a <dl> node at the root.  We
-            // want to process each <dt><dd> tag pair under that root.
-            var page_uri = null;
-            xhtml.all('dl *').each(function(element) {
-                if (element.get('tagName') == 'DT') {
-                    current_field = element.get('innerHTML');
-                } else if (element.get('tagName') == 'DD') {
-                    if (current_field == attribute_name) {
-                        // The field value is found
-                        success_message_node = Y.Node.create('<span></span>');
-                        rendered_content = element.get('innerHTML');
-                        success_message_node.set('innerHTML', rendered_content);
-                    } else if (current_field == 'web_link') {
-                        page_uri = element.get('innerHTML');
-                    } else if (current_field == 'self_link') {
-                        picker._resource_uri = element.get('innerHTML');
-                        content_uri_has_changed = (
-                            full_resource_uri != picker._resource_uri);
-                    }
-                }
-            });
-            activator.renderSuccess(success_message_node);
-            show_hide_buttons();
-            if (editing_main_context && content_uri_has_changed
-                && page_uri !== null) {
-                window.location = page_uri;
-            }
+
+          var xhtml = entry.getHTML(attribute_name);
+          var success_message_node = Y.Node.create('<span></span>');
+          success_message_node.set('innerHTML', xhtml);
+          activator.renderSuccess(success_message_node);
+          show_hide_buttons();
+          return;
         };
 
         var patch_payload = {};
@@ -145,7 +114,7 @@
 
         var client = new Y.lp.client.Launchpad();
         client.patch(picker._resource_uri, patch_payload, {
-            accept: 'application/xhtml+xml',
+            accept: 'application/json;include=lp_html',
             on: {
                 success: success_handler,
                 failure: failure_handler
@@ -177,6 +146,7 @@
         // Use picker._resource_uri, since it might have been changed
         // from the outside after the widget has already been initialized.
         client.patch(picker._resource_uri, patch_payload, {
+            accept: 'application/json;include=lp_html',
             on: {
                 success: success_handler,
                 failure: failure_handler

=== modified file 'lib/lp/app/javascript/tests/test_lp_client.html'
--- lib/lp/app/javascript/tests/test_lp_client.html	2011-02-24 01:54:21 +0000
+++ lib/lp/app/javascript/tests/test_lp_client.html	2011-02-28 01:12:51 +0000
@@ -12,8 +12,7 @@
   <link rel="stylesheet" href="../../../../canonical/launchpad/javascript/test.css" />
 
   <!-- The module under test -->
-  <script type="text/javascript"
-          src="../../../../canonical/launchpad/javascript/client/client.js"></script>
+  <script type="text/javascript" src="../client.js"></script>
 
   <!-- The test suite -->
   <script type="text/javascript" src="test_lp_client.js"></script>

=== modified file 'lib/lp/app/javascript/tests/test_lp_client.js'
--- lib/lp/app/javascript/tests/test_lp_client.js	2011-02-24 01:54:21 +0000
+++ lib/lp/app/javascript/tests/test_lp_client.js	2011-02-28 01:12:51 +0000
@@ -42,10 +42,135 @@
       Assert.areEqual(get_field_uri("/has/slash/", "field"),
                       "/api/devel/has/slash/field");
     }
-
-
-
-}));
+}));
+
+suite.add(new Y.Test.Case({
+    name: "update cache",
+
+    setUp: function() {
+        window.LP = {
+          cache: {
+             context: {
+              'first': "Hello",
+              'second': true,
+              'third': 42,
+              'fourth': "Unaltered",
+              'self_link': Y.lp.client.get_absolute_uri("a_self_link")
+            }
+          }};
+    },
+
+    tearDown: function() {
+        delete window.LP;
+    },
+
+    test_update_cache: function() {
+        // Make sure that the cached objects are in fact updated.
+        var entry_repr = {
+          'first': "World",
+          'second': false,
+          'third': 24,
+          'fourth': "Unaltered",
+          'self_link': Y.lp.client.get_absolute_uri("a_self_link")
+        };
+        var entry = new Y.lp.client.Entry(null, entry_repr, "a_self_link");
+        Y.lp.client.update_cache(entry);
+        Assert.areEqual("World", LP.cache.context.first);
+        Assert.areEqual(false, LP.cache.context.second);
+        Assert.areEqual(24, LP.cache.context.third);
+        Assert.areEqual("Unaltered", LP.cache.context.fourth);
+      },
+
+    test_update_cache_raises_events: function() {
+        // Check that the object changed event is raised.
+        var raised_event = null;
+        var handle = Y.on('lp:context:changed', function(e) {
+            raised_event = e;
+          });
+        var entry_repr = {
+          'first': "World",
+          'second': false,
+          'third': 24,
+          'fourth': "Unaltered",
+          'self_link': Y.lp.client.get_absolute_uri("a_self_link")
+        };
+        var entry = new Y.lp.client.Entry(null, entry_repr, "a_self_link");
+        Y.lp.client.update_cache(entry);
+        handle.detach();
+        Y.ArrayAssert.itemsAreEqual(
+            ['first','second','third'], raised_event.fields_changed);
+        Assert.areEqual(entry, raised_event.entry);
+      },
+
+    test_update_cache_raises_attribute_events: function() {
+        // Check that the object attribute changed events are raised.
+        var first_event = null;
+        var second_event = null;
+        var third_event = null;
+        var fourth_event = null;
+        var first_handle = Y.on('lp:context:first:changed', function(e) {
+            first_event = e;
+          });
+        var second_handle = Y.on('lp:context:second:changed', function(e) {
+            second_event = e;
+          });
+        var third_handle = Y.on('lp:context:third:changed', function(e) {
+            third_event = e;
+          });
+        var fourth_handle = Y.on('lp:context:fourth:changed', function(e) {
+            fourth_event = e;
+          });
+        var entry_repr = {
+          'first': "World",
+          'second': false,
+          'third': 24,
+          'fourth': "Unaltered",
+          'self_link': Y.lp.client.get_absolute_uri("a_self_link")
+        };
+        var entry = new Y.lp.client.Entry(null, entry_repr, "a_self_link");
+        Y.lp.client.update_cache(entry);
+        first_handle.detach();
+        second_handle.detach();
+        third_handle.detach();
+        fourth_handle.detach();
+
+        Assert.areEqual('first', first_event.name);
+        Assert.areEqual('Hello', first_event.old_value);
+        Assert.areEqual('World', first_event.new_value);
+        Assert.areEqual(entry, first_event.entry);
+
+        Assert.areEqual('second', second_event.name);
+        Assert.areEqual(true, second_event.old_value);
+        Assert.areEqual(false, second_event.new_value);
+        Assert.areEqual(entry, second_event.entry);
+
+        Assert.areEqual('third', third_event.name);
+        Assert.areEqual(42, third_event.old_value);
+        Assert.areEqual(24, third_event.new_value);
+        Assert.areEqual(entry, third_event.entry);
+
+        Assert.isNull(fourth_event);
+      },
+
+    test_update_cache_different_object: function() {
+        // Check that the object is not modified if the entry has a different
+        // link.
+        var entry_repr = {
+          'first': "World",
+          'second': false,
+          'third': 24,
+          'fourth': "Unaltered",
+          'self_link': Y.lp.client.get_absolute_uri("different_link")
+        };
+        var entry = new Y.lp.client.Entry(null, entry_repr, "different_link");
+        Y.lp.client.update_cache(entry);
+        Assert.areEqual("Hello", LP.cache.context.first);
+        Assert.areEqual(true, LP.cache.context.second);
+        Assert.areEqual(42, LP.cache.context.third);
+        Assert.areEqual("Unaltered", LP.cache.context.fourth);
+      }
+}));
+
 
 // Lock, stock, and two smoking barrels.
 var handle_complete = function(data) {

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2011-02-24 03:27:21 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2011-02-28 01:12:51 +0000
@@ -62,6 +62,12 @@
     somewhere in the automated test system that will prevent Windmill from
     executing.
   </tal:comment>
+  <script type="text/javascript">
+    var LP = {
+        cache: {},
+        links: {}
+    };
+  </script>
   <script type="text/javascript"
           tal:attributes="src string:${icingroot}/MochiKit.js"></script>
 
@@ -95,7 +101,6 @@
   <tal:comment replace="nothing">
     Load and initialize the common script used by all pages.
   </tal:comment>
-
   <tal:needs_json tal:condition="request/needs_json">
     <script type="text/javascript"
             tal:attributes="src string:${icingroot_contrib}/json2.js"></script>
@@ -106,25 +111,23 @@
   <metal:load-lavascript use-macro="context/@@+base-layout-macros/load-javascript" />
 
   <script id="base-layout-load-scripts" type="text/javascript">
-    LPS.use('node', 'lp', function(Y) {
+    LPS.use('node', 'lp', 'lp.app.links', function(Y) {
         Y.on('load', function(e) {
             sortables_init();
             initInlineHelp();
             Y.lp.activate_collapsibles();
             activateFoldables();
             activateConstrainBugExpiration();
+            Y.lp.app.links.check_valid_lp_links();
         }, window);
 
         // Hook up the function that dismisses the help window if we click
         // anywhere outside of it.
         Y.on('click', handleClickOnPage, window);
-    });
 
-    LPS.use('lp.app.links',
-      function(Y) {
-        Y.on('load', function(e) {
-            Y.lp.app.links.check_valid_lp_links();
-        }, window);
+        Y.on('lp:context:web_link:changed', function(e) {
+            window.location = e.new_value;
+        });
     });
   </script>
 </metal:page-javascript>

=== modified file 'lib/lp/app/templates/text-area-editor.pt'
--- lib/lp/app/templates/text-area-editor.pt	2011-01-27 20:25:05 +0000
+++ lib/lp/app/templates/text-area-editor.pt	2011-02-28 01:12:51 +0000
@@ -23,9 +23,8 @@
             widget.editor.plug({
                 fn: Y.lp.client.plugins.PATCHPlugin, cfg: {
                   patch: ${view/json_attribute},
-                  resource: ${view/json_attribute_uri},
-                  patch_field: true,
-                  accept: 'application/xhtml+xml'
+                  resource: ${view/json_resource_uri},
+                  use_html: true
             }});
             if (!Y.UA.opera) {
                 widget.render();

=== modified file 'lib/lp/app/templates/text-line-editor.pt'
--- lib/lp/app/templates/text-line-editor.pt	2011-01-27 20:25:05 +0000
+++ lib/lp/app/templates/text-line-editor.pt	2011-02-28 01:12:51 +0000
@@ -17,8 +17,7 @@
             widget.editor.plug({
                 fn: Y.lp.client.plugins.PATCHPlugin, cfg: {
                   patch: ${view/json_attribute},
-                  resource: ${view/json_attribute_uri},
-                  patch_field: true
+                  resource: ${view/json_resource_uri}
                   }});
             widget.render();
         });

=== modified file 'lib/lp/bugs/javascript/tests/test_bug_subscription_widget.html'
--- lib/lp/bugs/javascript/tests/test_bug_subscription_widget.html	2010-12-13 15:30:16 +0000
+++ lib/lp/bugs/javascript/tests/test_bug_subscription_widget.html	2011-02-28 01:12:51 +0000
@@ -28,7 +28,7 @@
     src="../../../../canonical/launchpad/icing/lazr/build/choiceedit/choiceedit.js">
   </script>
   <script type="text/javascript"
-    src="../../../../canonical/launchpad/javascript/client/client.js"></script>
+    src="../../../app/javascript/client.js"></script>
 
   <!-- The module under test -->
   <script type="text/javascript" src="../bug_subscription_widget.js"></script>

=== modified file 'lib/lp/bugs/javascript/tests/test_me_too.html'
--- lib/lp/bugs/javascript/tests/test_me_too.html	2011-02-07 15:21:02 +0000
+++ lib/lp/bugs/javascript/tests/test_me_too.html	2011-02-28 01:12:51 +0000
@@ -28,7 +28,7 @@
     src="../../../../canonical/launchpad/icing/lazr/build/choiceedit/choiceedit.js">
   </script>
   <script type="text/javascript"
-    src="../../../../canonical/launchpad/javascript/client/client.js"></script>
+    src="../../../app/javascript/client.js"></script>
   <script type="text/javascript" src="../subscriber.js"></script>
 
   <!-- The module under test -->

=== modified file 'lib/lp/bugs/javascript/tests/test_me_too.js'
--- lib/lp/bugs/javascript/tests/test_me_too.js	2011-02-24 00:01:31 +0000
+++ lib/lp/bugs/javascript/tests/test_me_too.js	2011-02-28 01:12:51 +0000
@@ -34,9 +34,11 @@
           function(url, func, config) {
             config.on.success();
           };
-        LP.cache.bug = {
-            self_link: "http://bugs.example.com/bugs/1234"
-        };
+        LP = {
+          'cache': {
+            'bug': {
+              self_link: "http://bugs.example.com/bugs/1234"
+          }}};
         // add the in-page HTML
         var inpage = Y.Node.create([
             '<span id="affectsmetoo">',

=== modified file 'lib/lp/bugs/javascript/tests/test_subscriber.html'
--- lib/lp/bugs/javascript/tests/test_subscriber.html	2011-02-25 03:54:13 +0000
+++ lib/lp/bugs/javascript/tests/test_subscriber.html	2011-02-28 01:12:51 +0000
@@ -17,7 +17,7 @@
       href="../../../../canonical/launchpad/javascript/test.css" />
 
     <script type="text/javascript"
-      src="../../../../canonical/launchpad/javascript/client/client.js"></script>
+      src="../../../app/javascript/client.js"></script>
 
     <!-- The module under test -->
     <script type="text/javascript"

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2011-02-23 23:25:01 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2011-02-28 01:12:51 +0000
@@ -46,7 +46,6 @@
     Choice,
     Datetime,
     Int,
-    Object,
     Text,
     TextLine,
     )
@@ -77,14 +76,16 @@
 class ISourcePackageRecipeData(Interface):
     """A recipe as database data, not text."""
 
-    base_branch = Object(
-        schema=IBranch, title=_("Base branch"), description=_(
-            "The base branch to use when building the recipe."))
+    base_branch = exported(
+        Reference(
+            IBranch, title=_("The base branch used by this recipe."),
+            required=True, readonly=True))
 
-    deb_version_template = TextLine(
-        title=_('deb-version template'),
-        description = _(
-            'The template that will be used to generate a deb version.'),)
+    deb_version_template = exported(
+        TextLine(
+            title=_('deb-version template'), readonly=True,
+            description = _(
+                'The template that will be used to generate a deb version.')))
 
     def getReferencedBranches():
         """An iterator of the branches referenced by this recipe."""
@@ -238,9 +239,6 @@
     debianized source tree.
     """
     export_as_webservice_entry()
-    base_branch = Reference(
-        IBranch, title=_("The base branch used by this recipe."),
-        required=True, readonly=True)
 
 
 class ISourcePackageRecipeSource(Interface):

=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
--- lib/lp/code/templates/sourcepackagerecipe-index.pt	2011-02-25 07:20:24 +0000
+++ lib/lp/code/templates/sourcepackagerecipe-index.pt	2011-02-28 01:12:51 +0000
@@ -139,12 +139,19 @@
   </div>
   <div class='portlet'>
     <h2>Recipe contents</h2>
-        <tal:widget replace="structure view/recipe_text_widget"/>
+    <tal:widget replace="structure view/recipe_text_widget"/>
   </div>
 
-  <tal:script>
-    <script id='requestbuild-script' type="text/javascript" tal:content="string:
-      LPS.use('io-base', 'lp.code.requestbuild_overlay', function(Y) {
+  <script type="text/javascript">
+    LPS.use('io-base', 'lp.ui', 'lp.code.requestbuild_overlay', function(Y) {
+
+        Y.on('lp:context:deb_version_template:changed', function(e) {
+            Y.lp.ui.update_field('#debian-version dd', e.new_value);
+        });
+        Y.on('lp:context:base_branch_link:changed', function(e) {
+            Y.lp.ui.update_field('#base-branch dd', e.entry.getHTML(e.name));
+        });
+
         if(Y.UA.ie) {
             return;
         }
@@ -163,7 +170,6 @@
       });"
     >
     </script>
-  </tal:script>
 </div>
 </body>
 </html>