[IMP] handling of registries created from other registries

bzr revid: xmo@openerp.com-20120208130738-pr92lh9qotki71o4

addons/web/static/src/js/core.js

@@ -254,6 +254,7 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
      * @param {Object} mapping a mapping of keys to object-paths
      */
     init: function (mapping) {
+        this.parent = null;
         this.map = mapping || {};
     },
     /**
@@ -269,6 +270,9 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
     get_object: function (key, silent_error) {
         var path_string = this.map[key];
         if (path_string === undefined) {
+            if (this.parent) {
+                return this.parent.get_object(key, silent_error);
+            }
             if (silent_error) { return void 'nooo'; }
             throw new openerp.web.KeyNotFound(key);
         }
@@ -286,6 +290,21 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
         }
         return object_match;
     },
+    /**
+     * Checks if the registry contains an object mapping for this key.
+     *
+     * @param {String} key key to look for
+     */
+    contains: function (key) {
+        if (key === undefined) { return false; }
+        if (key in this.map) {
+            return true
+        }
+        if (this.parent) {
+            return this.parent.contains(key);
+        }
+        return false;
+    },
     /**
      * Tries a number of keys, and returns the first object matching one of
      * the keys.
@@ -299,7 +318,7 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
     get_any: function (keys) {
         for (var i=0; i<keys.length; ++i) {
             var key = keys[i];
-            if (key === undefined || !(key in this.map)) {
+            if (!this.contains(key)) {
                 continue;
             }
 
@@ -324,11 +343,22 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
      * Creates and returns a copy of the current mapping, with the provided
      * mapping argument added in (replacing existing keys if needed)
      *
+     * Parent and child remain linked, a new key in the parent (which is not
+     * overwritten by the child) will appear in the child.
+     *
      * @param {Object} [mapping={}] a mapping of keys to object-paths
      */
+    extend: function (mapping) {
+        var child = new openerp.web.Registry(mapping);
+        child.parent = this;
+        return child;
+    },
+    /**
+     * @deprecated use Registry#extend
+     */
     clone: function (mapping) {
-        return new openerp.web.Registry(
-            _.extend({}, this.map, mapping || {}));
+        console.warn('Registry#clone is deprecated, use Registry#extend');
+        return this.extend(mapping);
     }
 });
 

addons/web/static/src/js/view_list_editable.js

@@ -386,7 +386,7 @@ openerp.web.list_editable = function (openerp) {
         template: 'ListView.row.frame'
     });
     var form_widgets = openerp.web.form.widgets;
-    openerp.web.list.form.widgets = form_widgets.clone({
+    openerp.web.list.form.widgets = form_widgets.extend({
         'frame': 'openerp.web.list.form.WidgetFrame'
     });
     // All form widgets inherit a problematic behavior from

addons/web/static/src/js/view_page.js

@@ -242,7 +242,7 @@ openerp.web.page = function (openerp) {
             }
         }
     });
-    openerp.web.page.readonly = openerp.web.form.widgets.clone({
+    openerp.web.page.readonly = openerp.web.form.widgets.extend({
         'frame': 'openerp.web.page.WidgetFrameReadonly',
         'char': 'openerp.web.page.FieldCharReadonly',
         'id': 'openerp.web.page.FieldCharReadonly',

addons/web/static/test/registry.js

@@ -6,6 +6,7 @@ $(document).ready(function () {
             window.openerp.web.core(openerp);
             openerp.web.Foo = {};
             openerp.web.Bar = {};
+            openerp.web.Foo2 = {};
         }
     });
     test('key fetch', function () {
@@ -30,4 +31,43 @@ $(document).ready(function () {
            .add('bar', 'openerp.web.Bar');
         strictEqual(reg.get_object('bar'), openerp.web.Bar);
     });
+    test('extension', function () {
+        var reg = new openerp.web.Registry({
+            foo: 'openerp.web.Foo',
+            bar: 'openerp.web.Bar'
+        });
+
+        var reg2 = reg.extend({ 'foo': 'openerp.web.Foo2' });
+        strictEqual(reg.get_object('foo'), openerp.web.Foo);
+        strictEqual(reg2.get_object('foo'), openerp.web.Foo2);
+    });
+    test('remain-linked', function () {
+        var reg = new openerp.web.Registry({
+            foo: 'openerp.web.Foo',
+            bar: 'openerp.web.Bar'
+        });
+
+        var reg2 = reg.extend();
+        reg.add('foo2', 'openerp.web.Foo2');
+        strictEqual(reg.get_object('foo2'), openerp.web.Foo2);
+        strictEqual(reg2.get_object('foo2'), openerp.web.Foo2);
+    });
+    test('multiget', function () {
+        var reg = new openerp.web.Registry({
+            foo: 'openerp.web.Foo',
+            bar: 'openerp.web.Bar'
+        });
+
+        strictEqual(reg.get_any(['qux', 'grault', 'bar', 'foo']),
+                    openerp.web.Bar);
+    });
+    test('extended-multiget', function () {
+        var reg = new openerp.web.Registry({
+            foo: 'openerp.web.Foo',
+            bar: 'openerp.web.Bar'
+        });
+        var reg2 = reg.extend();
+        strictEqual(reg2.get_any(['qux', 'grault', 'bar', 'foo']),
+                    openerp.web.Bar);
+    });
 });

addons/web/static/test/test.html

@@ -13,7 +13,7 @@
 
     <!-- jquery -->
     <script src="/web/static/lib/jquery/jquery-1.6.4.js"></script>
-    <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
+    <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script>
     <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
     
     <script src="/web/static/lib/datejs/globalization/en-US.js"></script>