From 404ac17e0e3ad75ba0306e64f5231260c2cd9aab Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 17 Feb 2012 10:35:41 +0100
Subject: [FIX] evaluate compound context from treeview before executing action

not actually sure if ActionManager#do_action is supposed to get a literal or a nonliteral context at this point... but ViewManager(Action) does not seem to like nonlit contexts at all so...

lp bug: https://launchpad.net/bugs/933360 fixed

bzr revid: xmo@openerp.com-20120217093541-pudzg8x4u1dhbkjf
---
 addons/web/static/src/js/view_tree.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index dea53793ffb..f0fc046a2f0 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -224,21 +224,25 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
             active_model: self.dataset.model,
             active_id: id,
             active_ids: [id]};
-        this.rpc('/web/treeview/action', {
+        return this.rpc('/web/treeview/action', {
             id: id,
             model: this.dataset.model,
             context: new openerp.web.CompoundContext(
                 this.dataset.get_context(), local_context)
-        }, function (actions) {
+        }).pipe(function (actions) {
             if (!actions.length) { return; }
             var action = actions[0][2];
             var c = new openerp.web.CompoundContext(local_context);
             if (action.context) {
                 c.add(action.context);
             }
-            action.context = c;
-            self.do_action(action);
-        });
+            return self.rpc('/web/session/eval_domain_and_context', {
+                contexts: [c], domains: []
+            }).pipe(function (res) {
+                action.context = res.context;
+                return self.do_action(action);
+            }, null);
+        }, null);
     },
 
     // show & hide the contents
-- 
cgit v1.2.3


From 39d514678cdf26fb131745c2d733bcd202b1b0cf Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Feb 2012 11:56:36 +0100
Subject: [imp] repaired illogic al's code

bzr revid: nicolas.vanhoren@openerp.com-20120217105636-61tk67zbx9calc1b
---
 addons/web/static/src/js/chrome.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ba31ec81846..72227c45dff 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1075,7 +1075,6 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
     },
     start: function() {
         var self = this;
-        this.$element = $(document.body);
         if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
             this.$element.addClass("kitten-mode-activated");
             this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
-- 
cgit v1.2.3


From feaade623ab11807b837dbf392608f9df25dd930 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Feb 2012 12:01:52 +0100
Subject: [imp] put openerp into body

bzr revid: nicolas.vanhoren@openerp.com-20120217110152-x66rfhyfkqao04k0
---
 addons/web/static/src/js/chrome.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 72227c45dff..1ce93216120 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1073,6 +1073,9 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
 
         this._current_state = null;
     },
+    render_element: function() {
+    	this.$element.addClass("openerp");
+    },
     start: function() {
         var self = this;
         if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
-- 
cgit v1.2.3


From 0d061d6c77b30e137d7650d63155297e5695979c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Feb 2012 12:43:57 +0100
Subject: [fix] added openerp class to all dialogs

bzr revid: nicolas.vanhoren@openerp.com-20120217114357-5jeue9292eg2zoqf
---
 addons/web/static/src/js/chrome.js      | 18 ++++++++++++------
 addons/web/static/src/js/data_import.js |  2 +-
 addons/web/static/src/js/search.js      |  4 ++--
 addons/web/static/src/js/view_form.js   |  6 +++---
 addons/web/static/src/js/views.js       |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1ce93216120..558631c6f13 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -45,6 +45,12 @@ openerp.web.Notification =  openerp.web.OldWidget.extend(/** @lends openerp.web.
 
 });
 
+openerp.web.dialog = function(element) {
+    var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
+    result.dialog("widget").addClass("openerp");
+    return result;
+}
+
 openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{
     dialog_title: "",
     /**
@@ -86,7 +92,7 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
         if (this.dialog_options.autoOpen) {
             this.open();
         } else {
-            this.$element.dialog(this.get_options());
+            openerp.web.dialog(this.$element, this.get_options());
         }
     },
     get_options: function(options) {
@@ -125,7 +131,7 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
             this.$element.html(this.render());
         }
         var o = this.get_options(options);
-        this.$element.dialog(o).dialog('open');
+        openerp.web.dialog(this.$element, o).dialog('open');
         if (o.height === 'auto' && o.max_height) {
             this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
         }
@@ -166,7 +172,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
         }
     },
     on_managed_error: function(error) {
-        $('<div>' + QWeb.render('CrashManagerWarning', {error: error}) + '</div>').dialog({
+    	openerp.web.dialog($('<div>' + QWeb.render('CrashManagerWarning', {error: error}) + '</div>'), {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: [
                 {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -407,7 +413,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
      * @param {String} error.error message of the error dialog
      */
     display_error: function (error) {
-        return $('<div>').dialog({
+        return openerp.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -704,7 +710,7 @@ openerp.web.Header =  openerp.web.OldWidget.extend(/** @lends openerp.web.Header
                 window.location = $.param.querystring(
                         window.location.href, 'debug');
             });
-            $help.dialog({autoOpen: true,
+            openerp.web.dialog($help, {autoOpen: true,
                 modal: true, width: 960, title: _t("About")});
         });
     },
@@ -828,7 +834,7 @@ openerp.web.Header =  openerp.web.OldWidget.extend(/** @lends openerp.web.Header
         });
     },
     display_error: function (error) {
-        return $('<div>').dialog({
+        return openerp.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 83eea2cccbb..e88ba765200 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -151,7 +151,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         });
     },
     toggle_import_button: function (newstate) {
-        this.$element.dialog('widget')
+    	openerp.web.dialog(this.$element, 'widget')
                 .find('.oe-dialog-import-button')
                 .button('option', 'disabled', !newstate);
     },
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 74ae65785f9..9cd3aca19f4 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -232,7 +232,7 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
             context.add({"group_by": groupbys});
             var dial_html = QWeb.render("SearchView.managed-filters.add");
             var $dial = $(dial_html);
-            $dial.dialog({
+            openerp.web.dialog($dial, {
                 modal: true,
                 title: _t("Filter Entry"),
                 buttons: [
@@ -281,7 +281,7 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
                 selected_menu_id : menu.$element.find('a.active').data('menu')
             }));
         $dialog.find('input').val(this.fields_view.name);
-        $dialog.dialog({
+        openerp.web.dialog($dialog, {
             modal: true,
             title: _t("Add to Dashboard"),
             buttons: [
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3f576089e5b..df59fdb3432 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -422,7 +422,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             this.on_form_changed();
         }
         if (!_.isEmpty(result.warning)) {
-            $(QWeb.render("CrashManagerWarning", result.warning)).dialog({
+        	openerp.web.dialog($(QWeb.render("CrashManagerWarning", result.warning)), {
                 modal: true,
                 buttons: [
                     {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -1249,7 +1249,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
         var exec_action = function() {
             if (self.node.attrs.confirm) {
                 var def = $.Deferred();
-                var dialog = $('<div>' + self.node.attrs.confirm + '</div>').dialog({
+                var dialog = openerp.web.dialog($('<div>' + self.node.attrs.confirm + '</div>'), {
                     title: _t('Confirm'),
                     modal: true,
                     buttons: [
@@ -3026,7 +3026,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
         this.context = context || {};
         this.options = _.defaults(options || {}, {"auto_write": true});
         this.render_element();
-        this.$element.dialog({
+        openerp.web.dialog(this.$element, {
             title: options.title || '',
             modal: true,
             width: 960,
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 56997190bc1..534f940b56d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -916,7 +916,7 @@ session.web.Sidebar = session.web.OldWidget.extend({
             var ids = self.widget_parent.get_selected_ids();
             if (ids.length == 0) {
                 //TODO: make prettier warning?
-                $("<div />").text(_t("You must choose at least one record.")).dialog({
+            	openerp.web.dialog($("<div />").text(_t("You must choose at least one record.")), {
                     title: _t("Warning"),
                     modal: true
                 });
-- 
cgit v1.2.3


From 9b1591c819dbb0a572951d803a93e99c4c6d5217 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Feb 2012 14:45:23 +0100
Subject: [fix] added openerp style to autocomplete in m2o

bzr revid: nicolas.vanhoren@openerp.com-20120217134523-bleeq4c1x3skjn4t
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index df59fdb3432..fc641521e3d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2043,6 +2043,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
             minLength: 0,
             delay: 0
         });
+        this.$input.autocomplete("widget").addClass("openerp");
         // used to correct a bug when selecting an element by pushing 'enter' in an editable list
         this.$input.keyup(function(e) {
             if (e.which === 13) {
-- 
cgit v1.2.3


From 571aac869c0c2383a23b0980baf81507e885fd17 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 20 Feb 2012 11:09:58 +0100
Subject: [fix] problem with reference fields

lp bug: https://launchpad.net/bugs/934330 fixed

bzr revid: nicolas.vanhoren@openerp.com-20120220100958-bujk0yuftdlzk3fz
---
 addons/web/static/src/js/view_form.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index fc641521e3d..f92db55f8e8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3147,7 +3147,11 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({
     },
     start: function() {
         this._super();
+        this.selection.$element = $(".oe_form_view_reference_selection", this.$element);
+        this.selection.render_element();
         this.selection.start();
+        this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element);
+        this.m2o.render_element();
         this.m2o.start();
     },
     is_valid: function() {
-- 
cgit v1.2.3


From 79a8b39369e3ee8636c493ba8784fdf5becb9110 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 20 Feb 2012 12:57:04 +0100
Subject: [FIX] avoid adding session_id and token fields in form if they are
 already there, reuse existing fields instead

lp bug: https://launchpad.net/bugs/936704 fixed

bzr revid: xmo@openerp.com-20120220115704-zxo024voy3dxa7qe
---
 addons/web/static/src/js/core.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index c4e37a8a3b1..106d2b86dc9 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -884,9 +884,12 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         _(_.extend({}, options.data || {},
                    {session_id: this.session_id, token: token}))
             .each(function (value, key) {
-                $('<input type="hidden" name="' + key + '">')
-                    .val(value)
-                    .appendTo($form_data);
+                var $input = $form.find('[name=' + key +']');
+                if (!$input.length) {
+                    $input = $('<input type="hidden" name="' + key + '">')
+                        .appendTo($form_data);
+                }
+                $input.val(value)
             });
 
         $form
-- 
cgit v1.2.3


From 5d71f85f7d46da261a165f5fe311383bb8eb8a97 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 20 Feb 2012 13:22:08 +0100
Subject: [FIX] Broken reference field

lp bug: https://launchpad.net/bugs/936864 fixed

bzr revid: fme@openerp.com-20120220122208-k5pvpwodik78hnrq
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 640fff67293..6b7acd5a244 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3090,7 +3090,7 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({
         };
         this.get_fields_values = view.get_fields_values;
         this.get_selected_ids = view.get_selected_ids;
-        this.do_onchange = this.on_form_changed = this.on_nop;
+        this.do_onchange = this.on_form_changed = this.do_notify_change = this.on_nop;
         this.dataset = this.view.dataset;
         this.widgets_counter = 0;
         this.view_id = 'reference_' + _.uniqueId();
-- 
cgit v1.2.3


From c02edfb523231ae48364fe07606f1614c3caec50 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 20 Feb 2012 15:43:22 +0100
Subject: [FIX] Broken reference field

lp bug: https://launchpad.net/bugs/936864 fixed

bzr revid: fme@openerp.com-20120220144322-e6ysl3qxsdhagls5
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f92db55f8e8..fcad37b8ff4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3116,7 +3116,7 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({
         };
         this.get_fields_values = view.get_fields_values;
         this.get_selected_ids = view.get_selected_ids;
-        this.do_onchange = this.on_form_changed = this.on_nop;
+        this.do_onchange = this.on_form_changed = this.do_notify_change = this.on_nop;
         this.dataset = this.view.dataset;
         this.widgets_counter = 0;
         this.view_id = 'reference_' + _.uniqueId();
-- 
cgit v1.2.3


From 383f1750c53cae05210b143ba2457ea541d579d6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 10:58:56 +0100
Subject: [imp] wip

bzr revid: nicolas.vanhoren@openerp.com-20120221095856-656l1so4ejc06gih
---
 addons/web/static/src/js/view_form.js          |  4 +++-
 addons/web/static/src/js/view_list_editable.js | 24 +++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index fcad37b8ff4..9e6c5396091 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -103,7 +103,9 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.$element.html(this.rendered);
         
         this.root_frame = instanciate_widget(this.registry.get_object('frame'), this, this.fields_view.arch);
-        this.root_frame.appendTo($(".oe_form_header", this.$element));
+        var to_append = $(".oe_form_header", this.$element);
+        this.root_frame.appendTo(to_append.length > 0 ? to_append : this.$element);
+        this.root_frame.$element.children().unwrap();
         
         this.$form_header = this.$element.find('.oe_form_header:first');
         this.$form_header.find('div.oe_form_pager button[data-pager-action]').click(function() {
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index c7222455889..de19fcdc3cd 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -202,7 +202,7 @@ openerp.web.list_editable = function (openerp) {
                 var $new_row = $('<tr>', {
                         id: _.uniqueId('oe-editable-row-'),
                         'data-id': record_id,
-                        'class': row ? $(row).attr('class') : '' + ' oe_forms',
+                        'class': row ? $(row).attr('class') : '' + ' oe_forms oe_form_header',
                         click: function (e) {e.stopPropagation();}
                     })
                     .delegate('button.oe-edit-row-save', 'click', function () {
@@ -235,13 +235,10 @@ openerp.web.list_editable = function (openerp) {
                 }
                 self.edition = true;
                 self.edition_id = record_id;
-                self.edition_form = _.extend(new openerp.web.ListEditableFormView(self.view, self.dataset, false), {
-                    form_template: 'ListView.row.form',
-                    registry: openerp.web.list.form.widgets,
-                    $element: $new_row
-                });
-                // HA HA
-                self.edition_form.appendTo();
+                self.edition_form = new openerp.web.ListEditableFormView(self.view, self.dataset, false);
+                self.edition_form.$element = $new_row;
+                // HO HO
+                // empty
                 $.when(self.edition_form.on_loaded(self.get_form_fields_view())).then(function () {
                     // put in $.when just in case  FormView.on_loaded becomes asynchronous
                     $new_row.find('> td')
@@ -383,7 +380,7 @@ openerp.web.list_editable = function (openerp) {
         openerp.web.list.form = {};
     }
     openerp.web.list.form.WidgetFrame = openerp.web.form.WidgetFrame.extend({
-        template: 'ListView.row.frame'
+        form_template: 'ListView.row.frame'
     });
     var form_widgets = openerp.web.form.widgets;
     openerp.web.list.form.widgets = form_widgets.extend({
@@ -418,9 +415,10 @@ openerp.web.list_editable = function (openerp) {
     });
     
     openerp.web.ListEditableFormView = openerp.web.FormView.extend({
-        init_view: function() {},
-        _render_and_insert: function () {
-            return this.start();
-        }
+        form_template: 'ListView.row.form',
+        init: function() {
+        	this._super.apply(this, arguments);
+        	this.registry = openerp.web.list.form.widgets;
+        },
     });
 };
-- 
cgit v1.2.3


From 4f09c66c3b1b7858faf45c04e782210a536c0073 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 11:15:22 +0100
Subject: [imp] removed useless class

bzr revid: nicolas.vanhoren@openerp.com-20120221101522-c9hkpg381cz6j5l4
---
 addons/web/static/src/js/view_list_editable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index de19fcdc3cd..6942f720863 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -202,7 +202,7 @@ openerp.web.list_editable = function (openerp) {
                 var $new_row = $('<tr>', {
                         id: _.uniqueId('oe-editable-row-'),
                         'data-id': record_id,
-                        'class': row ? $(row).attr('class') : '' + ' oe_forms oe_form_header',
+                        'class': row ? $(row).attr('class') : '' + ' oe_forms',
                         click: function (e) {e.stopPropagation();}
                     })
                     .delegate('button.oe-edit-row-save', 'click', function () {
-- 
cgit v1.2.3


From efb48237bb23fc646ffb48db511ba2f36b10071f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 11:52:29 +0100
Subject: [imp] improved html generation in editable lists

bzr revid: nicolas.vanhoren@openerp.com-20120221105229-h7609f8boalmvl6q
---
 addons/web/static/src/js/view_list_editable.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 6942f720863..55f710d69ab 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -237,21 +237,14 @@ openerp.web.list_editable = function (openerp) {
                 self.edition_id = record_id;
                 self.edition_form = new openerp.web.ListEditableFormView(self.view, self.dataset, false);
                 self.edition_form.$element = $new_row;
+                self.edition_form.editable_list = self;
                 // HO HO
                 // empty
                 $.when(self.edition_form.on_loaded(self.get_form_fields_view())).then(function () {
                     // put in $.when just in case  FormView.on_loaded becomes asynchronous
                     $new_row.find('> td')
-                          .addClass('oe-field-cell')
-                          .removeAttr('width')
                       .end()
                       .find('td:last').removeClass('oe-field-cell').end();
-                    if (self.options.selectable) {
-                        $new_row.prepend('<th>');
-                    }
-                    if (self.options.isClarkGable) {
-                        $new_row.prepend('<th>');
-                    }
                     // pad in case of groupby
                     _(self.columns).each(function (column) {
                         if (column.meta) {
-- 
cgit v1.2.3


From f4b4ef50887573f14689e59be7a3e6adfc1ba618 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 11:52:29 +0100
Subject: [imp] improved html generation in editable lists

bzr revid: nicolas.vanhoren@openerp.com-20120221105229-xrxcjwx2jtteh444
---
 addons/web/static/src/js/view_list_editable.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 6942f720863..55f710d69ab 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -237,21 +237,14 @@ openerp.web.list_editable = function (openerp) {
                 self.edition_id = record_id;
                 self.edition_form = new openerp.web.ListEditableFormView(self.view, self.dataset, false);
                 self.edition_form.$element = $new_row;
+                self.edition_form.editable_list = self;
                 // HO HO
                 // empty
                 $.when(self.edition_form.on_loaded(self.get_form_fields_view())).then(function () {
                     // put in $.when just in case  FormView.on_loaded becomes asynchronous
                     $new_row.find('> td')
-                          .addClass('oe-field-cell')
-                          .removeAttr('width')
                       .end()
                       .find('td:last').removeClass('oe-field-cell').end();
-                    if (self.options.selectable) {
-                        $new_row.prepend('<th>');
-                    }
-                    if (self.options.isClarkGable) {
-                        $new_row.prepend('<th>');
-                    }
                     // pad in case of groupby
                     _(self.columns).each(function (column) {
                         if (column.meta) {
-- 
cgit v1.2.3


From fbf4c6dc0f815b69ab07a8f9c1765e9ab6e858ba Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 21 Feb 2012 15:05:17 +0100
Subject: [FIX] incorrect handling of saved filter group_by when not present or
 an array

bzr revid: xmo@openerp.com-20120221140517-fs0axg9w8irapw06
---
 addons/web/static/src/js/search.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 74ae65785f9..2809b3792de 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -263,9 +263,14 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
             var filter = this.managed_filters[val];
             this.do_clear(false).then(_.bind(function() {
                 select.val('get:' + val);
-                var groupbys = _.map(filter.context.group_by.split(","), function(el) {
-                    return {"group_by": el};
-                });
+
+                var groupbys = [];
+                var group_by = filter.context.group_by;
+                if (group_by) {
+                    groupbys = _.map(
+                        group_by instanceof Array ? group_by : group_by.split(','),
+                        function (el) { return { group_by: el }; });
+                }
                 this.on_search([filter.domain], [filter.context], groupbys);
             }, this));
         } else {
-- 
cgit v1.2.3


From a6f6b7fd9dd636bde823b39edc309f69eb994d6d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 16:22:12 +0100
Subject: [imp] added setParent

bzr revid: nicolas.vanhoren@openerp.com-20120221152212-yr6iaa2znq37mcsz
---
 addons/web/static/src/js/core.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 086f7f3b56a..647a8713dff 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1006,6 +1006,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         
         this.$element = $(document.createElement(this.tag_name));
 
+        this.setParent(parent);
+    },
+    setParent: function(parent) {
         this.widget_parent = parent;
         this.widget_children = [];
         if(parent && parent.widget_children) {
-- 
cgit v1.2.3


From 8384876ef08ae3e8af97a9531da7f79a8359d607 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 16:30:23 +0100
Subject: [imp] renamed widget_parent to getParent()

bzr revid: nicolas.vanhoren@openerp.com-20120221153023-cqs66neaddtuf7km
---
 addons/web/static/src/js/chrome.js      | 10 +++++-----
 addons/web/static/src/js/core.js        |  3 +++
 addons/web/static/src/js/data_import.js |  4 ++--
 addons/web/static/src/js/search.js      | 14 +++++++-------
 addons/web/static/src/js/view_form.js   |  2 +-
 addons/web/static/src/js/view_list.js   |  2 +-
 addons/web/static/src/js/views.js       | 34 ++++++++++++++++-----------------
 7 files changed, 36 insertions(+), 33 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 558631c6f13..bbaad17c60c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -261,7 +261,7 @@ openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loadin
             $(".loading",this.$element).text(_.str.sprintf(
                 _t("Loading (%d)"), this.count));
             $(".loading",this.$element).show();
-            this.widget_parent.$element.addClass('loading');
+            this.getParent().$element.addClass('loading');
         } else {
             this.count = 0;
             clearTimeout(this.long_running_timer);
@@ -271,7 +271,7 @@ openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loadin
                 $.unblockUI();
             }
             $(".loading",this.$element).fadeOut();
-            this.widget_parent.$element.removeClass('loading');
+            this.getParent().$element.removeClass('loading');
         }
     }
 });
@@ -381,7 +381,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
 
             var admin = result[1][0];
             setTimeout(function () {
-                self.widget_parent.do_login(
+                self.getParent().do_login(
                         info.db, admin.login, admin.password);
                 self.stop();
                 self.unblockUI();
@@ -437,7 +437,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
                     if (self.db_list) {
                         self.db_list.push(self.to_object(fields)['db_name']);
                         self.db_list.sort();
-                        self.widget_parent.set_db_list(self.db_list);
+                        self.getParent().set_db_list(self.db_list);
                     }
                     var form_obj = self.to_object(fields);
                     self.wait_for_newdb(result, {
@@ -469,7 +469,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
                     $db_list.find(':selected').remove();
                     if (self.db_list) {
                         self.db_list.splice(_.indexOf(self.db_list, db, true), 1);
-                        self.widget_parent.set_db_list(self.db_list);
+                        self.getParent().set_db_list(self.db_list);
                     }
                     self.do_notify("Dropping database", "The database '" + db + "' has been dropped");
                 });
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 647a8713dff..dca4ad47d0e 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1017,6 +1017,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         // useful to know if the widget was destroyed and should not be used anymore
         this.widget_is_stopped = false;
     },
+    getParent: function() {
+        return this.widget_parent;
+    },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
      *
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index e88ba765200..e50f5a7b3db 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -201,8 +201,8 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
             return;
         }
         if (results['success']) {
-            if (this.widget_parent.widget_parent.active_view == "list") {
-                this.widget_parent.reload_content();
+            if (this.getParent().getParent().active_view == "list") {
+                this.getParent().reload_content();
             }
             this.stop();
             return;
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 9cd3aca19f4..3645f761e33 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -303,10 +303,10 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
                     });
                     self.rpc('/web/searchview/add_to_dashboard', {
                         menu_id: menu_id,
-                        action_id: self.widget_parent.action.id,
+                        action_id: self.getParent().action.id,
                         context_to_save: context,
                         domain: domain,
-                        view_mode: self.widget_parent.active_view,
+                        view_mode: self.getParent().active_view,
                         name: title
                     }, function(r) {
                         if (r === false) {
@@ -1173,9 +1173,9 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
             props);
     },
     stop: function() {
-        var parent = this.widget_parent;
-        if (this.widget_parent.widget_children.length == 1)
-            this.widget_parent.hide();
+        var parent = this.getParent();
+        if (this.getParent().widget_children.length == 1)
+            this.getParent().hide();
         this._super();
         parent.check_last_element();
     },
@@ -1215,8 +1215,8 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
     },
     stop: function() {
         var parent;
-        if (this.widget_parent.widget_children.length == 1)
-            parent = this.widget_parent;
+        if (this.getParent().widget_children.length == 1)
+            parent = this.getParent();
         this._super();
         if (parent)
             parent.stop();
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9e6c5396091..ad72bde16ee 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2782,7 +2782,7 @@ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends open
         var pop = new openerp.web.form.FormOpenPopup(this);
         pop.show_element(this.dataset.model, id, this.m2m_field.build_context(), {
             title: _t("Open: ") + this.name,
-            readonly: this.widget_parent.is_readonly()
+            readonly: this.getParent().is_readonly()
         });
         pop.on_write_completed.add_last(function() {
             self.reload_content();
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index eb13bbd927b..2394e12eb4d 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -96,7 +96,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         if (this._limit === undefined) {
             this._limit = (this.options.limit
                         || this.defaults.limit
-                        || (this.widget_parent.action || {}).limit
+                        || (this.getParent().action || {}).limit
                         || 80);
         }
         return this._limit;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 534f940b56d..3e5ae3b4c8e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -47,14 +47,14 @@ session.web.ActionManager = session.web.OldWidget.extend({
         }
     },
     do_push_state: function(state) {
-        if (this.widget_parent && this.widget_parent.do_push_state) {
+        if (this.getParent() && this.getParent().do_push_state) {
             if (this.inner_action) {
                 state['model'] = this.inner_action.res_model;
                 if (this.inner_action.id) {
                     state['action_id'] = this.inner_action.id;
                 }
             }
-            this.widget_parent.do_push_state(state);
+            this.getParent().do_push_state(state);
         }
     },
     do_load_state: function(state, warm) {
@@ -150,7 +150,7 @@ session.web.ActionManager = session.web.OldWidget.extend({
             this.dialog.open();
         } else  {
             if(action.menu_id) {
-                return this.widget_parent.do_action(action, function () {
+                return this.getParent().do_action(action, function () {
                     session.webclient.menu.open_menu(action.menu_id);
                 });
             }
@@ -209,7 +209,7 @@ session.web.ActionManager = session.web.OldWidget.extend({
         window.open(action.url, action.target === 'self' ? '_self' : '_blank');
     },
     ir_ui_menu: function (action) {
-        this.widget_parent.do_action(action);
+        this.getParent().do_action(action);
     }
 });
 
@@ -680,9 +680,9 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
         });
     },
     do_push_state: function(state) {
-        if (this.widget_parent && this.widget_parent.do_push_state) {
+        if (this.getParent() && this.getParent().do_push_state) {
             state["view_type"] = this.active_view;
-            this.widget_parent.do_push_state(state);
+            this.getParent().do_push_state(state);
         }
     },
     do_load_state: function(state, warm) {
@@ -702,7 +702,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
     },
     shortcut_check : function(view) {
         var self = this;
-        var grandparent = this.widget_parent && this.widget_parent.widget_parent;
+        var grandparent = this.getParent() && this.getParent().getParent();
         // display shortcuts if on the first view for the action
         var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
         if (!this.action.name ||
@@ -796,8 +796,8 @@ session.web.Sidebar = session.web.OldWidget.extend({
     },
     add_default_sections: function() {
         var self = this,
-            view = this.widget_parent,
-            view_manager = view.widget_parent,
+            view = this.getParent(),
+            view_manager = view.getParent(),
             action = view_manager.action;
         if (this.session.uid === 1) {
             this.add_section(_t('Customize'), 'customize');
@@ -912,8 +912,8 @@ session.web.Sidebar = session.web.OldWidget.extend({
     },
     on_item_action_clicked: function(item) {
         var self = this;
-        self.widget_parent.sidebar_context().then(function (context) {
-            var ids = self.widget_parent.get_selected_ids();
+        self.getParent().sidebar_context().then(function (context) {
+            var ids = self.getParent().get_selected_ids();
             if (ids.length == 0) {
                 //TODO: make prettier warning?
             	openerp.web.dialog($("<div />").text(_t("You must choose at least one record.")), {
@@ -925,7 +925,7 @@ session.web.Sidebar = session.web.OldWidget.extend({
             var additional_context = _.extend({
                 active_id: ids[0],
                 active_ids: ids,
-                active_model: self.widget_parent.dataset.model
+                active_model: self.getParent().dataset.model
             }, context);
             self.rpc("/web/action/load", {
                 action_id: item.action.id,
@@ -937,7 +937,7 @@ session.web.Sidebar = session.web.OldWidget.extend({
                 result.result.flags.new_window = true;
                 self.do_action(result.result, function () {
                     // reload view
-                    self.widget_parent.reload();
+                    self.getParent().reload();
                 });
             });
         });
@@ -1111,8 +1111,8 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
         var self = this;
         var result_handler = function () {
             if (on_closed) { on_closed.apply(null, arguments); }
-            if (self.widget_parent && self.widget_parent.on_action_executed) {
-                return self.widget_parent.on_action_executed.apply(null, arguments);
+            if (self.getParent() && self.getParent().on_action_executed) {
+                return self.getParent().on_action_executed.apply(null, arguments);
             }
         };
         var context = new session.web.CompoundContext(dataset.get_context(), action_data.context || {});
@@ -1184,8 +1184,8 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
         this.$element.hide();
     },
     do_push_state: function(state) {
-        if (this.widget_parent && this.widget_parent.do_push_state) {
-            this.widget_parent.do_push_state(state);
+        if (this.getParent() && this.getParent().do_push_state) {
+            this.getParent().do_push_state(state);
         }
     },
     do_load_state: function(state, warm) {
-- 
cgit v1.2.3


From cdd8489e4ca4c790cc4772ec1a6edbee4fe8136f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 16:44:58 +0100
Subject: [imp] further refactoring of parents

bzr revid: nicolas.vanhoren@openerp.com-20120221154458-imbqiywuj91mds9c
---
 addons/web/static/src/js/core.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index dca4ad47d0e..ca4d5f00781 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -974,6 +974,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
  * That will kill the widget in a clean way and erase its content from the dom.
  */
 openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.Widget# */{
+    __parented_mixin: true,
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -1009,16 +1010,23 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         this.setParent(parent);
     },
     setParent: function(parent) {
-        this.widget_parent = parent;
-        this.widget_children = [];
-        if(parent && parent.widget_children) {
+        if(this.getParent()) {
+            if (this.getParent().__parented_mixin) {
+                this.getParent().widget_children = _.without(this.getParent().widget_children, this);
+            }
+            this.__parented_parent = undefined;
+        }
+        this.__parented_parent = parent;
+        if(parent && parent.__parented_mixin) {
+            if (!parent.widget_children)
+                parent.widget_children = [];
             parent.widget_children.push(this);
         }
         // useful to know if the widget was destroyed and should not be used anymore
         this.widget_is_stopped = false;
     },
     getParent: function() {
-        return this.widget_parent;
+        return this.__parented_parent;
     },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
@@ -1120,10 +1128,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         if(this.$element != null) {
             this.$element.remove();
         }
-        if (this.widget_parent && this.widget_parent.widget_children) {
-            this.widget_parent.widget_children = _.without(this.widget_parent.widget_children, this);
-        }
-        this.widget_parent = null;
+        this.setParent(undefined);
         this.widget_is_stopped = true;
     },
     /**
@@ -1132,20 +1137,20 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
      * If that's not the case this method will simply return `false`.
      */
     do_action: function(action, on_finished) {
-        if (this.widget_parent) {
-            return this.widget_parent.do_action(action, on_finished);
+        if (this.getParent()) {
+            return this.getParent().do_action(action, on_finished);
         }
         return false;
     },
     do_notify: function() {
-        if (this.widget_parent) {
-            return this.widget_parent.do_notify.apply(this,arguments);
+        if (this.getParent()) {
+            return this.getParent().do_notify.apply(this,arguments);
         }
         return false;
     },
     do_warn: function() {
-        if (this.widget_parent) {
-            return this.widget_parent.do_warn.apply(this,arguments);
+        if (this.getParent()) {
+            return this.getParent().do_warn.apply(this,arguments);
         }
         return false;
     },
-- 
cgit v1.2.3


From be66f62357f7cf0658a7c04b8cc41c15e38c55c8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 16:51:34 +0100
Subject: [imp] changed children

bzr revid: nicolas.vanhoren@openerp.com-20120221155134-lej2ren1troagr72
---
 addons/web/static/src/js/chrome.js |  2 +-
 addons/web/static/src/js/core.js   | 13 ++++++++-----
 addons/web/static/src/js/search.js | 16 ++++++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bbaad17c60c..9c145c95d05 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1152,7 +1152,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
         this.loading.appendTo(this.$element);
     },
     destroy_content: function() {
-        _.each(_.clone(this.widget_children), function(el) {
+        _.each(_.clone(this.getChildren()), function(el) {
             el.stop();
         });
         this.$element.children().remove();
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index ca4d5f00781..d31d27b8fa4 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1012,15 +1012,15 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     setParent: function(parent) {
         if(this.getParent()) {
             if (this.getParent().__parented_mixin) {
-                this.getParent().widget_children = _.without(this.getParent().widget_children, this);
+                this.getParent().__parented_children = _.without(this.getParent().getChildren(), this);
             }
             this.__parented_parent = undefined;
         }
         this.__parented_parent = parent;
         if(parent && parent.__parented_mixin) {
-            if (!parent.widget_children)
-                parent.widget_children = [];
-            parent.widget_children.push(this);
+            if (!parent.getChildren())
+                parent.__parented_children = [];
+            parent.getChildren().push(this);
         }
         // useful to know if the widget was destroyed and should not be used anymore
         this.widget_is_stopped = false;
@@ -1028,6 +1028,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     getParent: function() {
         return this.__parented_parent;
     },
+    getChildren: function() {
+        return this.__parented_children || [];
+    },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
      *
@@ -1122,7 +1125,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
      * Destroys the current widget, also destroys all its children before destroying itself.
      */
     stop: function() {
-        _.each(_.clone(this.widget_children), function(el) {
+        _.each(_.clone(this.getChildren()), function(el) {
             el.stop();
         });
         if(this.$element != null) {
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 3645f761e33..424d21f1d90 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1114,7 +1114,7 @@ openerp.web.search.ExtendedSearch = openerp.web.search.Input.extend({
         if(this.$element.closest("table.oe-searchview-render-line").css("display") == "none") {
             return null;
         }
-        return _.reduce(this.widget_children,
+        return _.reduce(this.getChildren(),
             function(mem, x) { return mem.concat(x.get_domain());}, []);
     },
     on_activate: function() {
@@ -1133,9 +1133,9 @@ openerp.web.search.ExtendedSearch = openerp.web.search.Input.extend({
         }
     },
     check_last_element: function() {
-        _.each(this.widget_children, function(x) {x.set_last_group(false);});
-        if (this.widget_children.length >= 1) {
-            this.widget_children[this.widget_children.length - 1].set_last_group(true);
+        _.each(this.getChildren(), function(x) {x.set_last_group(false);});
+        if (this.getChildren().length >= 1) {
+            this.getChildren()[this.getChildren().length - 1].set_last_group(true);
         }
     }
 });
@@ -1148,7 +1148,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
     },
     add_prop: function() {
         var prop = new openerp.web.search.ExtendedSearchProposition(this, this.fields);
-        var render = prop.render({'index': this.widget_children.length - 1});
+        var render = prop.render({'index': this.getChildren().length - 1});
         this.$element.find('.searchview_extended_propositions_list').append(render);
         prop.start();
     },
@@ -1163,7 +1163,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
         });
     },
     get_domain: function() {
-        var props = _(this.widget_children).chain().map(function(x) {
+        var props = _(this.getChildren()).chain().map(function(x) {
             return x.get_proposition();
         }).compact().value();
         var choice = this.$element.find(".searchview_extended_group_choice").val();
@@ -1174,7 +1174,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
     },
     stop: function() {
         var parent = this.getParent();
-        if (this.getParent().widget_children.length == 1)
+        if (this.getParent().getChildren().length == 1)
             this.getParent().hide();
         this._super();
         parent.check_last_element();
@@ -1215,7 +1215,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
     },
     stop: function() {
         var parent;
-        if (this.getParent().widget_children.length == 1)
+        if (this.getParent().getChildren().length == 1)
             parent = this.getParent();
         this._super();
         if (parent)
-- 
cgit v1.2.3


From 7fcfcbaddbea0da9c17eed388ef5d7af21b9e100 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 16:55:16 +0100
Subject: [imp] changed is_stopped

bzr revid: nicolas.vanhoren@openerp.com-20120221155516-7eczor9bobky9dxq
---
 addons/web/static/src/js/core.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index d31d27b8fa4..9e9e01428ba 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1022,8 +1022,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
                 parent.__parented_children = [];
             parent.getChildren().push(this);
         }
-        // useful to know if the widget was destroyed and should not be used anymore
-        this.widget_is_stopped = false;
     },
     getParent: function() {
         return this.__parented_parent;
@@ -1031,6 +1029,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     getChildren: function() {
         return this.__parented_children || [];
     },
+    isStopped: function() {
+        return this.__parented_stopped;
+    },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
      *
@@ -1132,7 +1133,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
             this.$element.remove();
         }
         this.setParent(undefined);
-        this.widget_is_stopped = true;
+        this.__parented_stopped = true;
     },
     /**
      * Informs the action manager to do an action. This supposes that
@@ -1162,10 +1163,10 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         var def = $.Deferred().then(success, error);
         var self = this;
         openerp.connection.rpc(url, data). then(function() {
-            if (!self.widget_is_stopped)
+            if (!self.isStopped())
                 def.resolve.apply(def, arguments);
         }, function() {
-            if (!self.widget_is_stopped)
+            if (!self.isStopped())
                 def.reject.apply(def, arguments);
         });
         return def.promise();
-- 
cgit v1.2.3


From 4ee34acbbec49b6de11b1ef0843b4e6605d60227 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 16:58:06 +0100
Subject: [imp] cosmetic changes

bzr revid: nicolas.vanhoren@openerp.com-20120221155806-e6efydx5k7qtppdn
---
 addons/web/static/src/js/core.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 9e9e01428ba..992c7fef83c 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1029,9 +1029,22 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     getChildren: function() {
         return this.__parented_children || [];
     },
-    isStopped: function() {
+    isDestroyed: function() {
         return this.__parented_stopped;
     },
+    /**
+     * Destroys the current widget, also destroys all its children before destroying itself.
+     */
+    stop: function() {
+        _.each(_.clone(this.getChildren()), function(el) {
+            el.stop();
+        });
+        if(this.$element != null) {
+            this.$element.remove();
+        }
+        this.setParent(undefined);
+        this.__parented_stopped = true;
+    },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
      *
@@ -1122,19 +1135,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     start: function() {
         return $.Deferred().done().promise();
     },
-    /**
-     * Destroys the current widget, also destroys all its children before destroying itself.
-     */
-    stop: function() {
-        _.each(_.clone(this.getChildren()), function(el) {
-            el.stop();
-        });
-        if(this.$element != null) {
-            this.$element.remove();
-        }
-        this.setParent(undefined);
-        this.__parented_stopped = true;
-    },
     /**
      * Informs the action manager to do an action. This supposes that
      * the action manager can be found amongst the ancestors of the current widget.
@@ -1163,10 +1163,10 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         var def = $.Deferred().then(success, error);
         var self = this;
         openerp.connection.rpc(url, data). then(function() {
-            if (!self.isStopped())
+            if (!self.isDestroyed())
                 def.resolve.apply(def, arguments);
         }, function() {
-            if (!self.isStopped())
+            if (!self.isDestroyed())
                 def.reject.apply(def, arguments);
         });
         return def.promise();
-- 
cgit v1.2.3


From 75d39c7f6a2565419c28bac4397678a6d60c5544 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 17:29:12 +0100
Subject: [imp] renammed stop()

bzr revid: nicolas.vanhoren@openerp.com-20120221162912-zheko30qoh84hcoq
---
 addons/web/static/src/js/chrome.js             | 14 ++++++-------
 addons/web/static/src/js/core.js               |  8 ++++----
 addons/web/static/src/js/data_import.js        |  8 ++++----
 addons/web/static/src/js/search.js             | 14 ++++++-------
 addons/web/static/src/js/view_editor.js        |  4 ++--
 addons/web/static/src/js/view_form.js          | 28 +++++++++++++-------------
 addons/web/static/src/js/view_list_editable.js |  2 +-
 addons/web/static/src/js/views.js              | 12 +++++------
 8 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 9c145c95d05..060abeefc2c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -148,7 +148,7 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
     on_resized: function() {
         //openerp.log("Dialog resized to %d x %d", this.$element.width(), this.$element.height());
     },
-    stop: function () {
+    destroy: function () {
         // Destroy widget
         this.close();
         this.$element.dialog('destroy');
@@ -240,7 +240,7 @@ openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loadin
         this.session.on_rpc_request.add_first(this.request_call);
         this.session.on_rpc_response.add_last(this.response_call);
     },
-    stop: function() {
+    destroy: function() {
         this.session.on_rpc_request.remove(this.request_call);
         this.session.on_rpc_response.remove(this.response_call);
         this.on_rpc_event(-this.count);
@@ -318,7 +318,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
             self.hide();
         });
     },
-    stop: function () {
+    destroy: function () {
         this.hide();
         this.$option_id.empty();
 
@@ -383,7 +383,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
             setTimeout(function () {
                 self.getParent().do_login(
                         info.db, admin.login, admin.password);
-                self.stop();
+                self.destroy();
                 self.unblockUI();
             });
         });
@@ -799,7 +799,7 @@ openerp.web.Header =  openerp.web.OldWidget.extend(/** @lends openerp.web.Header
                         var inner_viewmanager = action_manager.inner_viewmanager;
                         inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save()
                         .then(function() {
-                            self.dialog.stop();
+                            self.dialog.destroy();
                             // needs to refresh interface in case language changed
                             window.location.reload();
                         });
@@ -1101,7 +1101,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
             self.header.do_update();
             self.menu.do_reload();
             if(self.action_manager)
-                self.action_manager.stop();
+                self.action_manager.destroy();
             self.action_manager = new openerp.web.ActionManager(self);
             self.action_manager.appendTo($("#oe_app"));
             self.bind_hashchange();
@@ -1153,7 +1153,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
     },
     destroy_content: function() {
         _.each(_.clone(this.getChildren()), function(el) {
-            el.stop();
+            el.destroy();
         });
         this.$element.children().remove();
     },
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 992c7fef83c..63e0e2010c5 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -969,7 +969,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
  *
  * And of course, when you don't need that widget anymore, just do:
  *
- * my_widget.stop();
+ * my_widget.destroy();
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
@@ -994,7 +994,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
      * @extends openerp.web.CallbackEnabled
      *
      * @param {openerp.web.Widget} parent Binds the current instance to the given Widget instance.
-     * When that widget is destroyed by calling stop(), the current instance will be
+     * When that widget is destroyed by calling destroy(), the current instance will be
      * destroyed too. Can be null.
      * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
      * to bind the current Widget to an already existing part of the DOM, which is not compatible
@@ -1035,9 +1035,9 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
     /**
      * Destroys the current widget, also destroys all its children before destroying itself.
      */
-    stop: function() {
+    destroy: function() {
         _.each(_.clone(this.getChildren()), function(el) {
-            el.stop();
+            el.destroy();
         });
         if(this.$element != null) {
             this.$element.remove();
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index e50f5a7b3db..3054a7784c4 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -66,11 +66,11 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         this._super();
         this.open({
             buttons: [
-                {text: _t("Close"), click: function() { self.stop(); }},
+                {text: _t("Close"), click: function() { self.destroy(); }},
                 {text: _t("Import File"), click: function() { self.do_import(); }, 'class': 'oe-dialog-import-button'}
             ],
             close: function(event, ui) {
-                self.stop();
+                self.destroy();
             }
         });
         this.toggle_import_button(false);
@@ -204,7 +204,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
             if (this.getParent().getParent().active_view == "list") {
                 this.getParent().reload_content();
             }
-            this.stop();
+            this.destroy();
             return;
         }
 
@@ -358,7 +358,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         }
         return true;
     },
-    stop: function() {
+    destroy: function() {
         this.$element.remove();
         this._super();
     }
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 424d21f1d90..b57dd2e2302 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -552,7 +552,7 @@ openerp.web.search.Widget = openerp.web.OldWidget.extend( /** @lends openerp.web
      * "Stops" the widgets. Called when the view destroys itself, this
      * lets the widgets clean up after themselves.
      */
-    stop: function () {
+    destroy: function () {
         delete this.view;
         this._super();
     },
@@ -1159,7 +1159,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
             _this.add_prop();
         });
         this.$element.find('.searchview_extended_delete_group').click(function () {
-            _this.stop();
+            _this.destroy();
         });
     },
     get_domain: function() {
@@ -1172,7 +1172,7 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
             _.map(_.range(_.max([0,props.length - 1])), function() { return op; }),
             props);
     },
-    stop: function() {
+    destroy: function() {
         var parent = this.getParent();
         if (this.getParent().getChildren().length == 1)
             this.getParent().hide();
@@ -1210,16 +1210,16 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
             _this.changed();
         });
         this.$element.find('.searchview_extended_delete_prop').click(function () {
-            _this.stop();
+            _this.destroy();
         });
     },
-    stop: function() {
+    destroy: function() {
         var parent;
         if (this.getParent().getChildren().length == 1)
             parent = this.getParent();
         this._super();
         if (parent)
-            parent.stop();
+            parent.destroy();
     },
     changed: function() {
         var nval = this.$element.find(".searchview_extended_prop_field").val();
@@ -1235,7 +1235,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
     select_field: function(field) {
         var self = this;
         if(this.attrs.selected != null) {
-            this.value.stop();
+            this.value.destroy();
             this.value = null;
             this.$element.find('.searchview_extended_prop_op').html('');
         }
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 0258509f172..2c0dc3d70b4 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1002,10 +1002,10 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_viewmanager.views['form'].controller;
             controller.on_button_cancel.add_last(function(){
-                action_manager.stop()
+                action_manager.destroy()
             });
             controller.do_save.add_last(function(){
-                action_manager.stop();
+                action_manager.destroy();
                 var value =controller.fields.name.value;
                 self.add_node_dialog.$element.find('select[id=field_value]').append($("<option selected></option>").attr("value",value).text(value));
                     _.detect(self.add_widget,function(widget){
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ad72bde16ee..17b9849cd42 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -74,13 +74,13 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                 }, this.on_loaded);
         }
     },
-    stop: function() {
+    destroy: function() {
         if (this.sidebar) {
-            this.sidebar.attachments.stop();
-            this.sidebar.stop();
+            this.sidebar.attachments.destroy();
+            this.sidebar.destroy();
         }
         _.each(this.widgets, function(w) {
-            w.stop();
+            w.destroy();
         });
         this._super();
     },
@@ -923,7 +923,7 @@ openerp.web.form.Widget = openerp.web.OldWidget.extend(/** @lends openerp.web.fo
 
         this.width = this.node.attrs.width;
     },
-    stop: function() {
+    destroy: function() {
         this._super.apply(this, arguments);
         $.fn.tipsy.clear();
     },
@@ -2554,7 +2554,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
             this.previous_readonly = this.readonly;
             if (this.viewmanager) {
                 this.is_loaded = this.is_loaded.pipe(function() {
-                    self.viewmanager.stop();
+                    self.viewmanager.destroy();
                     return $.when(self.load_views()).then(function() {
                         self.reload_current_view();
                     });
@@ -2734,7 +2734,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({
             this.previous_readonly = this.readonly;
             if (this.list_view) {
                 this.is_loaded = this.is_loaded.pipe(function() {
-                    self.list_view.stop();
+                    self.list_view.destroy();
                     return $.when(self.load_view()).then(function() {
                         self.reload_content();
                     });
@@ -2866,7 +2866,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
     setup_search_view: function(search_defaults) {
         var self = this;
         if (this.searchview) {
-            this.searchview.stop();
+            this.searchview.destroy();
         }
         this.searchview = new openerp.web.SearchView(this,
                 this.dataset, false,  search_defaults);
@@ -2896,7 +2896,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
                 $buttons.prepend(QWeb.render("SelectCreatePopup.search.buttons"));
                 var $cbutton = $buttons.find(".oe_selectcreatepopup-search-close");
                 $cbutton.click(function() {
-                    self.stop();
+                    self.destroy();
                 });
                 var $sbutton = $buttons.find(".oe_selectcreatepopup-search-select");
                 if(self.options.disable_multiple_selection) {
@@ -2904,7 +2904,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
                 }
                 $sbutton.click(function() {
                     self.on_select_elements(self.selected_ids);
-                    self.stop();
+                    self.destroy();
                 });
             });
         });
@@ -2988,7 +2988,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
         if (this.created_elements.length > 0) {
             this.on_select_elements(this.created_elements);
         }
-        this.stop();
+        this.destroy();
     },
     on_default_get: function(res) {}
 });
@@ -2999,7 +2999,7 @@ openerp.web.form.SelectCreateListView = openerp.web.ListView.extend({
     },
     select_record: function(index) {
         this.popup.on_select_elements([this.dataset.ids[index]]);
-        this.popup.stop();
+        this.popup.destroy();
     },
     do_select: function(ids, records) {
         this._super(ids, records);
@@ -3075,12 +3075,12 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
             var $nbutton = $buttons.find(".oe_formopenpopup-form-save");
             $nbutton.click(function() {
                 self.view_form.do_save().then(function() {
-                    self.stop();
+                    self.destroy();
                 });
             });
             var $cbutton = $buttons.find(".oe_formopenpopup-form-close");
             $cbutton.click(function() {
-                self.stop();
+                self.destroy();
             });
             if (self.options.readonly) {
                 $nbutton.hide();
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 55f710d69ab..b8699bcc006 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -139,7 +139,7 @@ openerp.web.list_editable = function (openerp) {
             }
             cancelled.then(function () {
                 self.view.unpad_columns();
-                self.edition_form.stop();
+                self.edition_form.destroy();
                 self.edition_form.$element.remove();
                 delete self.edition_form;
                 delete self.edition_id;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 3e5ae3b4c8e..08886ddfbe3 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -30,19 +30,19 @@ session.web.ActionManager = session.web.OldWidget.extend({
     },
     dialog_stop: function () {
         if (this.dialog) {
-            this.dialog_viewmanager.stop();
+            this.dialog_viewmanager.destroy();
             this.dialog_viewmanager = null;
-            this.dialog.stop();
+            this.dialog.destroy();
             this.dialog = null;
         }
     },
     content_stop: function () {
         if (this.inner_viewmanager) {
-            this.inner_viewmanager.stop();
+            this.inner_viewmanager.destroy();
             this.inner_viewmanager = null;
         }
         if (this.client_widget) {
-            this.client_widget.stop();
+            this.client_widget.destroy();
             this.client_widget = null;
         }
     },
@@ -142,7 +142,7 @@ session.web.ActionManager = session.web.OldWidget.extend({
                 if(on_close)
                     this.dialog.on_close.add(on_close);
             } else {
-                this.dialog_viewmanager.stop();
+                this.dialog_viewmanager.destroy();
             }
             this.dialog.dialog_title = action.name;
             this.dialog_viewmanager = new session.web.ViewManagerAction(this, action);
@@ -385,7 +385,7 @@ session.web.ViewManager =  session.web.OldWidget.extend(/** @lends session.web.V
     setup_search_view: function(view_id, search_defaults) {
         var self = this;
         if (this.searchview) {
-            this.searchview.stop();
+            this.searchview.destroy();
         }
         this.searchview = new session.web.SearchView(
                 this, this.dataset,
-- 
cgit v1.2.3


From a7386b589a99197453f1a5311fbf1d388efee3b0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Feb 2012 17:35:47 +0100
Subject: [imp] extracted parenting into a mixin

bzr revid: nicolas.vanhoren@openerp.com-20120221163547-i1ii1frqj9b6ddtp
---
 addons/web/static/src/js/core.js | 63 +++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 27 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 63e0e2010c5..a02c6767ca3 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -925,6 +925,40 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
     }
 });
 
+openerp.web.ParentedMixin = {
+    __parented_mixin: true,
+    setParent: function(parent) {
+        if(this.getParent()) {
+            if (this.getParent().__parented_mixin) {
+                this.getParent().__parented_children = _.without(this.getParent().getChildren(), this);
+            }
+            this.__parented_parent = undefined;
+        }
+        this.__parented_parent = parent;
+        if(parent && parent.__parented_mixin) {
+            if (!parent.getChildren())
+                parent.__parented_children = [];
+            parent.getChildren().push(this);
+        }
+    },
+    getParent: function() {
+        return this.__parented_parent;
+    },
+    getChildren: function() {
+        return this.__parented_children ? _.clone(this.__parented_children) : [];
+    },
+    isDestroyed: function() {
+        return this.__parented_stopped;
+    },
+    destroy: function() {
+        _.each(this.getChildren(), function(el) {
+            el.destroy();
+        });
+        this.setParent(undefined);
+        this.__parented_stopped = true;
+    },
+};
+
 /**
  * Base class for all visual components. Provides a lot of functionalities helpful
  * for the management of a part of the DOM.
@@ -973,8 +1007,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.Widget# */{
-    __parented_mixin: true,
+openerp.web.Widget = openerp.web.CallbackEnabled.extend(openerp.web.ParentedMixin).extend(/** @lends openerp.web.Widget# */{
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -1009,29 +1042,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
 
         this.setParent(parent);
     },
-    setParent: function(parent) {
-        if(this.getParent()) {
-            if (this.getParent().__parented_mixin) {
-                this.getParent().__parented_children = _.without(this.getParent().getChildren(), this);
-            }
-            this.__parented_parent = undefined;
-        }
-        this.__parented_parent = parent;
-        if(parent && parent.__parented_mixin) {
-            if (!parent.getChildren())
-                parent.__parented_children = [];
-            parent.getChildren().push(this);
-        }
-    },
-    getParent: function() {
-        return this.__parented_parent;
-    },
-    getChildren: function() {
-        return this.__parented_children || [];
-    },
-    isDestroyed: function() {
-        return this.__parented_stopped;
-    },
     /**
      * Destroys the current widget, also destroys all its children before destroying itself.
      */
@@ -1042,8 +1052,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         if(this.$element != null) {
             this.$element.remove();
         }
-        this.setParent(undefined);
-        this.__parented_stopped = true;
+        this._super();
     },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
-- 
cgit v1.2.3


From bd4723f66d0e5a68ab48214837fbca98d2d37ca2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 22 Feb 2012 11:22:34 +0100
Subject: [fix] some details

bzr revid: nicolas.vanhoren@openerp.com-20120222102234-k9jjclhmgpalf3qs
---
 addons/web/static/src/js/core.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index a02c6767ca3..fd0abcb0eb4 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -936,9 +936,9 @@ openerp.web.ParentedMixin = {
         }
         this.__parented_parent = parent;
         if(parent && parent.__parented_mixin) {
-            if (!parent.getChildren())
+            if (!parent.__parented_children)
                 parent.__parented_children = [];
-            parent.getChildren().push(this);
+            parent.__parented_children.push(this);
         }
     },
     getParent: function() {
@@ -948,14 +948,14 @@ openerp.web.ParentedMixin = {
         return this.__parented_children ? _.clone(this.__parented_children) : [];
     },
     isDestroyed: function() {
-        return this.__parented_stopped;
+        return this.__parented_destroyed;
     },
     destroy: function() {
         _.each(this.getChildren(), function(el) {
             el.destroy();
         });
         this.setParent(undefined);
-        this.__parented_stopped = true;
+        this.__parented_destroyed = true;
     },
 };
 
@@ -1046,7 +1046,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(openerp.web.ParentedMixi
      * Destroys the current widget, also destroys all its children before destroying itself.
      */
     destroy: function() {
-        _.each(_.clone(this.getChildren()), function(el) {
+        _.each(this.getChildren(), function(el) {
             el.destroy();
         });
         if(this.$element != null) {
-- 
cgit v1.2.3


From 10e55d570197d27b78bdbb3502df3a5e85edfe18 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 22 Feb 2012 15:23:23 +0100
Subject: [ADD] Minh's sass playground

bzr revid: fme@openerp.com-20120222142323-mg2z3kndzm29xisg
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 558631c6f13..8997896a57d 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1080,7 +1080,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
         this._current_state = null;
     },
     render_element: function() {
-    	this.$element.addClass("openerp");
+        this.$element.addClass("openerp openerp2");
     },
     start: function() {
         var self = this;
-- 
cgit v1.2.3


From 3baa0d76081f0d5e2d6ebc10296a8efaf656cfbc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 22 Feb 2012 17:13:24 +0100
Subject: [FIX] Widget: correctly check if rendered template is empty

bzr revid: fme@openerp.com-20120222161324-fut6gawp70qff0ev
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 086f7f3b56a..b394570b72d 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1086,7 +1086,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         var rendered = null;
         if (this.template)
             rendered = openerp.web.qweb.render(this.template, {widget: this});
-        if (rendered) {
+        if (_.str.trim(rendered)) {
             var elem = $(rendered);
             this.$element.replaceWith(elem);
             this.$element = elem;
-- 
cgit v1.2.3


From 3644361b1f3f429e15efde6e80e1cb26456cdad8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 14:11:40 +0100
Subject: [IMP] Webclient not OldWidget anymore. Renamed template to
 'WebClient'

Made a seperate revision because of edi addon dependency

bzr revid: fme@openerp.com-20120223131140-2p7uycfs2el6ibei
---
 addons/web/static/src/js/chrome.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 15d0d0fc633..63587ad59fa 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1065,12 +1065,10 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
     }
 });
 
-openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebClient */{
+openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{
     /**
      * @constructs openerp.web.WebClient
-     * @extends openerp.web.OldWidget
-     *
-     * @param element_id
+     * @extends openerp.web.Widget
      */
     init: function(parent) {
         var self = this;
@@ -1079,11 +1077,9 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
 
         this._current_state = null;
     },
-    render_element: function() {
-        this.$element.addClass("openerp openerp2");
-    },
     start: function() {
         var self = this;
+        this.$element.addClass("openerp openerp2");
         if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
             this.$element.addClass("kitten-mode-activated");
             this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
@@ -1123,7 +1119,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
         var self = this;
         this.destroy_content();
         this.show_common();
-        self.$table = $(QWeb.render("Interface", {}));
+        self.$table = $(QWeb.render("WebClient", {}));
         self.$element.append(self.$table);
         self.header = new openerp.web.Header(self);
         self.header.on_logout.add(this.proxy('on_logout'));
-- 
cgit v1.2.3


From 50853cbaac022fea60009b49c29bde2bac592c2a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 14:39:37 +0100
Subject: [FIX] ability to backup databases in case listing databases is
 forbidden (via --no-database-list on the server)

lp bug: https://launchpad.net/bugs/939428 fixed

bzr revid: xmo@openerp.com-20120223133937-3115jyzjtbzequbq
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ba31ec81846..132cc3b5851 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -449,7 +449,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
             submitHandler: function (form) {
                 var $form = $(form),
                     fields = $form.serializeArray(),
-                    $db_list = $form.find('select[name=drop_db]'),
+                    $db_list = $form.find('[name=drop_db]'),
                     db = $db_list.val();
 
                 if (!confirm("Do you really want to delete the database: " + db + " ?")) {
-- 
cgit v1.2.3


From a55e7148e344319c70fb7c9bc7fa41b0d94c06b4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 15:51:57 +0100
Subject: [FIX] correctly set dataset index when selecting a record in list
 view, so switching to page/form switches to the first selected record, not
 the first record of the page

lp bug: https://launchpad.net/bugs/939314 fixed

bzr revid: xmo@openerp.com-20120223145157-rkkwg6pwcr6hh7st
---
 addons/web/static/src/js/view_list.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index eb13bbd927b..ec8e6a17c87 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -540,19 +540,17 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {Array} records selected record values
      */
     do_select: function (ids, records) {
-        this.$element.find('.oe-list-delete')
-            .attr('disabled', !ids.length);
-        if (this.sidebar) {
-            if (ids.length) {
-                this.sidebar.do_unfold();
-            } else {
-                this.sidebar.do_fold();
-            }
-        }
-        if (!records.length) {
+        this.$element.find('.oe-list-delete').attr('disabled', !ids.length);
+        if (!ids.length) {
+            this.dataset.index = 0;
+            if (this.sidebar) { this.sidebar.do_fold(); }
             this.compute_aggregates();
             return;
         }
+
+        this.dataset.index = _(this.dataset.ids).indexOf(ids[0]);
+        if (this.sidebar) { this.sidebar.do_unfold(); }
+
         this.compute_aggregates(_(records).map(function (record) {
             return {count: 1, values: record};
         }));
-- 
cgit v1.2.3


From a90d466ccbb23f8bc00c6fb5bcb1ce86adbdae68 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 16:02:30 +0100
Subject: [ADD] Add styles for new main menu

bzr revid: fme@openerp.com-20120223150230-n935rq8bv65a6gbj
---
 addons/web/static/src/js/chrome.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 63587ad59fa..9d26b39ffad 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -887,7 +887,7 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
     on_toggle_fold: function() {
         this.$secondary_menu.toggleClass('oe_folded').toggleClass('oe_unfolded');
         if (this.folded) {
-            this.$secondary_menu.find('.oe_secondary_menu.active').show();
+            this.$secondary_menu.find('.oe_secondary_menu.oe_active').show();
         } else {
             this.$secondary_menu.find('.oe_secondary_menu').hide();
         }
@@ -903,8 +903,8 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
      * @param {Number} menu_id database id of the terminal menu to select
      */
     open_menu: function (menu_id) {
-        this.$element.add(this.$secondary_menu).find('.active')
-                .removeClass('active');
+        this.$element.add(this.$secondary_menu).find('.oe_active')
+                .removeClass('oe_active');
         this.$secondary_menu.find('> .oe_secondary_menu').hide();
 
         var $primary_menu;
@@ -913,7 +913,7 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
         if ($secondary_submenu.length) {
             for(;;) {
                 if ($secondary_submenu.hasClass('leaf')) {
-                    $secondary_submenu.addClass('active');
+                    $secondary_submenu.addClass('oe_active');
                 } else if ($secondary_submenu.hasClass('submenu')) {
                     $secondary_submenu.addClass('opened')
                 }
@@ -932,9 +932,9 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
         if (!$primary_menu.length) {
             return;
         }
-        $primary_menu.addClass('active');
+        $primary_menu.addClass('oe_active');
         this.$secondary_menu.find(
-            'div[data-menu-parent=' + $primary_menu.data('menu') + ']').addClass('active').toggle(!this.folded);
+            'div[data-menu-parent=' + $primary_menu.data('menu') + ']').addClass('oe_active').toggle(!this.folded);
     },
     on_menu_click: function(ev, id) {
         id = id || 0;
@@ -964,7 +964,7 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
     },
     do_menu_click: function($clicked_menu, manual) {
         var $sub_menu, $main_menu,
-            active = $clicked_menu.is('.active'),
+            active = $clicked_menu.is('.oe_active'),
             sub_menu_visible = false,
             has_submenu_items = false;
 
@@ -980,8 +980,8 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
         has_submenu_items = !!$sub_menu.children().length;
         this.$secondary_menu.find('.oe_secondary_menu').hide();
 
-        $('.active', this.$element.add(this.$secondary_menu)).removeClass('active');
-        $main_menu.add($clicked_menu).add($sub_menu).addClass('active');
+        $('.oe_active', this.$element.add(this.$secondary_menu)).removeClass('oe_active');
+        $main_menu.add($clicked_menu).add($sub_menu).addClass('oe_active');
 
         if (has_submenu_items) {
             if (!(this.folded && manual)) {
@@ -1125,7 +1125,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         self.header.on_logout.add(this.proxy('on_logout'));
         self.header.on_action.add(this.proxy('on_menu_action'));
         self.header.appendTo($("#oe_header"));
-        self.menu = new openerp.web.Menu(self, "oe_menu", "oe_secondary_menu");
+        self.menu = new openerp.web.Menu(self, "oe_menu_temporary_id", "oe_secondary_menu");
         self.menu.on_action.add(this.proxy('on_menu_action'));
         self.menu.start();
     },
-- 
cgit v1.2.3


From 2e681ad98b808a1dbee47526eb845766a9574c06 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 16:39:21 +0100
Subject: [CHG] Updated Secondary Menu (moved in a div)

bzr revid: fme@openerp.com-20120223153921-u23y5ylp2sqhs3ev
---
 addons/web/static/src/js/chrome.js | 81 ++++++--------------------------------
 1 file changed, 12 insertions(+), 69 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 9d26b39ffad..4e648e46856 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -846,29 +846,14 @@ openerp.web.Header =  openerp.web.OldWidget.extend(/** @lends openerp.web.Header
     }
 });
 
-openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */{
+openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     /**
      * @constructs openerp.web.Menu
-     * @extends openerp.web.OldWidget
+     * @extends openerp.web.Widget
      *
      * @param parent
-     * @param element_id
-     * @param secondary_menu_id
      */
-    init: function(parent, element_id, secondary_menu_id) {
-        this._super(parent, element_id);
-        this.secondary_menu_id = secondary_menu_id;
-        this.$secondary_menu = $("#" + secondary_menu_id);
-        this.menu = false;
-        this.folded = false;
-        if (window.localStorage) {
-            this.folded = localStorage.getItem('oe_menu_folded') === 'true';
-        }
-        this.float_timeout = 700;
-    },
-    start: function() {
-        this.$secondary_menu.addClass(this.folded ? 'oe_folded' : 'oe_unfolded');
-    },
+    template: 'Menu',
     do_reload: function() {
         var self = this;
         return this.rpc("/web/menu/load", {}, this.on_loaded).then(function () {
@@ -879,22 +864,13 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
     },
     on_loaded: function(data) {
         this.data = data;
-        this.$element.html(QWeb.render("Menu", { widget : this }));
+        this.render_element();
+        if (!this.$secondary_menu && this.getParent()) {
+            // TODO: create Widget openerp.web.SubMenu
+            this.$secondary_menu = this.getParent().$element.find('.oe_secondary_menu');
+        }
         this.$secondary_menu.html(QWeb.render("Menu.secondary", { widget : this }));
         this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
-        this.$secondary_menu.find('.oe_toggle_secondary_menu').click(this.on_toggle_fold);
-    },
-    on_toggle_fold: function() {
-        this.$secondary_menu.toggleClass('oe_folded').toggleClass('oe_unfolded');
-        if (this.folded) {
-            this.$secondary_menu.find('.oe_secondary_menu.oe_active').show();
-        } else {
-            this.$secondary_menu.find('.oe_secondary_menu').hide();
-        }
-        this.folded = !this.folded;
-        if (window.localStorage) {
-            localStorage.setItem('oe_menu_folded', this.folded.toString());
-        }
     },
     /**
      * Opens a given menu by id, as if a user had browsed to that menu by hand
@@ -934,7 +910,7 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
         }
         $primary_menu.addClass('oe_active');
         this.$secondary_menu.find(
-            'div[data-menu-parent=' + $primary_menu.data('menu') + ']').addClass('oe_active').toggle(!this.folded);
+            'div[data-menu-parent=' + $primary_menu.data('menu') + ']').addClass('oe_active');
     },
     on_menu_click: function(ev, id) {
         id = id || 0;
@@ -984,7 +960,7 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
         $main_menu.add($clicked_menu).add($sub_menu).addClass('oe_active');
 
         if (has_submenu_items) {
-            if (!(this.folded && manual)) {
+            if (!manual) {
                 this.do_show_secondary($sub_menu, $main_menu);
             } else {
                 this.do_show_secondary();
@@ -1000,15 +976,8 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
                 });
                 $clicked_menu.toggleClass('opened').next().toggle();
             } else if ($clicked_menu.is('.leaf')) {
-                $sub_menu.toggle(!this.folded);
-                return true;
-            }
-        } else if (this.folded) {
-            if ((active && sub_menu_visible) || !has_submenu_items) {
-                $sub_menu.hide();
                 return true;
             }
-            return manual;
         } else {
             return true;
         }
@@ -1023,32 +992,6 @@ openerp.web.Menu =  openerp.web.OldWidget.extend(/** @lends openerp.web.Menu# */
         if (!arguments.length) {
             return;
         }
-        if (this.folded) {
-            var css = $main_menu.position(),
-                fold_width = this.$secondary_menu.width() + 2,
-                window_width = $(window).width();
-            css.top += 33;
-            css.left -= Math.round(($sub_menu.width() - $main_menu.width()) / 2);
-            css.left = css.left < fold_width ? fold_width : css.left;
-            if ((css.left + $sub_menu.width()) > window_width) {
-                delete(css.left);
-                css.right = 1;
-            }
-            $sub_menu.css(css);
-            $sub_menu.mouseenter(function() {
-                clearTimeout($sub_menu.data('timeoutId'));
-                $sub_menu.data('timeoutId', null);
-                return false;
-            }).mouseleave(function(evt) {
-                var timeoutId = setTimeout(function() {
-                    if (self.folded && $sub_menu.data('timeoutId')) {
-                        $sub_menu.hide().unbind('mouseenter').unbind('mouseleave');
-                    }
-                }, self.float_timeout);
-                $sub_menu.data('timeoutId', timeoutId);
-                return false;
-            });
-        }
         $sub_menu.show();
     },
     on_menu_action_loaded: function(data) {
@@ -1125,9 +1068,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         self.header.on_logout.add(this.proxy('on_logout'));
         self.header.on_action.add(this.proxy('on_menu_action'));
         self.header.appendTo($("#oe_header"));
-        self.menu = new openerp.web.Menu(self, "oe_menu_temporary_id", "oe_secondary_menu");
+        self.menu = new openerp.web.Menu(self);
+        self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on_action.add(this.proxy('on_menu_action'));
-        self.menu.start();
     },
     show_common: function() {
         var self = this;
-- 
cgit v1.2.3


From fa510462f4c49d434cd2ed4145eb8c3c99dae0e6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 23 Feb 2012 17:10:41 +0100
Subject: [imp] switched to nivjs

bzr revid: nicolas.vanhoren@openerp.com-20120223161041-mymbna11fsp3bo9m
---
 addons/web/static/src/js/core.js | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index fd0abcb0eb4..69ec98e7350 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -925,40 +925,6 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
     }
 });
 
-openerp.web.ParentedMixin = {
-    __parented_mixin: true,
-    setParent: function(parent) {
-        if(this.getParent()) {
-            if (this.getParent().__parented_mixin) {
-                this.getParent().__parented_children = _.without(this.getParent().getChildren(), this);
-            }
-            this.__parented_parent = undefined;
-        }
-        this.__parented_parent = parent;
-        if(parent && parent.__parented_mixin) {
-            if (!parent.__parented_children)
-                parent.__parented_children = [];
-            parent.__parented_children.push(this);
-        }
-    },
-    getParent: function() {
-        return this.__parented_parent;
-    },
-    getChildren: function() {
-        return this.__parented_children ? _.clone(this.__parented_children) : [];
-    },
-    isDestroyed: function() {
-        return this.__parented_destroyed;
-    },
-    destroy: function() {
-        _.each(this.getChildren(), function(el) {
-            el.destroy();
-        });
-        this.setParent(undefined);
-        this.__parented_destroyed = true;
-    },
-};
-
 /**
  * Base class for all visual components. Provides a lot of functionalities helpful
  * for the management of a part of the DOM.
@@ -1007,7 +973,7 @@ openerp.web.ParentedMixin = {
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = openerp.web.CallbackEnabled.extend(openerp.web.ParentedMixin).extend(/** @lends openerp.web.Widget# */{
+openerp.web.Widget = openerp.web.CallbackEnabled.extend(niv.ParentedMixin).extend(/** @lends openerp.web.Widget# */{
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
-- 
cgit v1.2.3


From b64f4c6875b099aa780c5cfd15bfcacec88c2003 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 23 Feb 2012 18:44:39 +0100
Subject: [ADD] Added dropdown menu.

bzr revid: fme@openerp.com-20120223174439-nlyeqjobi230e7xx
---
 addons/web/static/src/js/chrome.js | 77 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4e648e46856..838fdb4f79f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -984,7 +984,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         return false;
     },
     do_hide_secondary: function() {
-        this.$secondary_menu.hide();
+        //this.$secondary_menu.hide();
     },
     do_show_secondary: function($sub_menu, $main_menu) {
         var self = this;
@@ -1008,6 +1008,78 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     }
 });
 
+openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.Header# */{
+    template: "DropDownMenu",
+    /**
+     * @constructs openerp.web.DropDownMenu
+     * @extends openerp.web.OldWidget
+     *
+     * @param parent
+     */
+    init: function(parent) {
+        this._super(parent);
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+        $('html').bind('click', function() {
+            self.$element.find('.oe_dropdown_options').hide();
+        });
+        this.$element.find('.oe_dropdown_toggle').click(function() {
+            self.$element.find('.oe_dropdown_options').toggle();
+            return false;
+        });
+        this.$element.find('.oe_dropdown_options li a').click(function() {
+            var f = self['on_menu_' + $(this).data('menu')];
+            f && f();
+            self.$element.find('.oe_dropdown_options').hide();
+            return false;
+        });
+    },
+    on_menu_logout: function() {
+    },
+    on_menu_settings: function() {
+        var self = this;
+        var action_manager = new openerp.web.ActionManager(this);
+        var dataset = new openerp.web.DataSet (this,'res.users',this.context);
+        dataset.call ('action_get','',function (result){
+            self.rpc('/web/action/load', {action_id:result}, function(result){
+                action_manager.do_action(_.extend(result['result'], {
+                    res_id: self.session.uid,
+                    res_model: 'res.users',
+                    flags: {
+                        action_buttons: false,
+                        search_view: false,
+                        sidebar: false,
+                        views_switcher: false,
+                        pager: false
+                    }
+                }));
+            });
+        });
+        this.dialog = new openerp.web.Dialog(this,{
+            title: _t("Preferences"),
+            width: '700px',
+            buttons: [
+                {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
+                {text: _t("Change password"), click: function(){ self.change_password(); }},
+                {text: _t("Save"), click: function(){
+                        var inner_viewmanager = action_manager.inner_viewmanager;
+                        inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save()
+                        .then(function() {
+                            self.dialog.destroy();
+                            // needs to refresh interface in case language changed
+                            window.location.reload();
+                        });
+                    }
+                }
+            ]
+        }).open();
+       action_manager.appendTo(this.dialog);
+       action_manager.render(this.dialog);
+    }
+});
+
 openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{
     /**
      * @constructs openerp.web.WebClient
@@ -1071,6 +1143,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         self.menu = new openerp.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on_action.add(this.proxy('on_menu_action'));
+        self.dropdown_menu = new openerp.web.DropDownMenu(self);
+        self.dropdown_menu.replace(this.$element.find('.oe_dropdown_menu_placeholder'));
+        self.dropdown_menu.on_menu_logout.add(this.proxy('on_logout'));
     },
     show_common: function() {
         var self = this;
-- 
cgit v1.2.3


From 87f65775e00404063104486954eefe2b649e93f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 24 Feb 2012 10:53:10 +0100
Subject: Correct viewport integration, cosmetic changes, node loops

bzr revid: fva@openerp.com-20120224095310-r3bdlx09n5eaxrvk
---
 addons/web/static/src/js/view_form.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6b7acd5a244..d98c597c8a6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2835,6 +2835,10 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             this.new_object();
         }
     },
+    stop: function () {
+        this.$element.dialog('close');
+        this._super();
+    },
     setup_search_view: function(search_defaults) {
         var self = this;
         if (this.searchview) {
-- 
cgit v1.2.3


From a2b98743785dc4290e5b5adfac5892c2e0707fda Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 24 Feb 2012 14:26:39 +0100
Subject: [imp] adapted widget to new lib

bzr revid: nicolas.vanhoren@openerp.com-20120224132639-um1aitu3bymnk7wo
---
 addons/web/static/src/js/core.js | 108 +++------------------------------------
 1 file changed, 7 insertions(+), 101 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 69ec98e7350..9a564c653bb 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -362,7 +362,7 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
     }
 });
 
-openerp.web.CallbackEnabled = openerp.web.Class.extend(/** @lends openerp.web.CallbackEnabled# */{
+openerp.web.CallbackEnabledMixin = {
     /**
      * @constructs openerp.web.CallbackEnabled
      * @extends openerp.web.Class
@@ -404,7 +404,9 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(/** @lends openerp.web.Ca
             return self[method_name].apply(self, arguments);
         }
     }
-});
+};
+
+openerp.web.CallbackEnabled = openerp.web.Class.extend(_.extend({}, openerp.web.CallbackEnabledMixin));
 
 openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
     /**
@@ -973,7 +975,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = openerp.web.CallbackEnabled.extend(niv.ParentedMixin).extend(/** @lends openerp.web.Widget# */{
+openerp.web.Widget = niv.Widget.extend(_.extend({}, openerp.web.CallbackEnabledMixin, {
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -981,11 +983,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(niv.ParentedMixin).exten
      * @type string
      */
     template: null,
-    /**
-     * Tag name when creating a default $element.
-     * @type string
-     */
-    tag_name: 'div',
     /**
      * Constructs the widget and sets its parent if a parent is given.
      *
@@ -1001,88 +998,10 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(niv.ParentedMixin).exten
      * for new components this argument should not be provided any more.
      */
     init: function(parent) {
+        openerp.web.CallbackEnabledMixin.init.call(this);
         this._super();
         this.session = openerp.connection;
-        
-        this.$element = $(document.createElement(this.tag_name));
-
-        this.setParent(parent);
-    },
-    /**
-     * Destroys the current widget, also destroys all its children before destroying itself.
-     */
-    destroy: function() {
-        _.each(this.getChildren(), function(el) {
-            el.destroy();
-        });
-        if(this.$element != null) {
-            this.$element.remove();
-        }
-        this._super();
-    },
-    /**
-     * Renders the current widget and appends it to the given jQuery object or Widget.
-     *
-     * @param target A jQuery object or a Widget instance.
-     */
-    appendTo: function(target) {
-        var self = this;
-        return this._render_and_insert(function(t) {
-            self.$element.appendTo(t);
-        }, target);
-    },
-    /**
-     * Renders the current widget and prepends it to the given jQuery object or Widget.
-     *
-     * @param target A jQuery object or a Widget instance.
-     */
-    prependTo: function(target) {
-        var self = this;
-        return this._render_and_insert(function(t) {
-            self.$element.prependTo(t);
-        }, target);
     },
-    /**
-     * Renders the current widget and inserts it after to the given jQuery object or Widget.
-     *
-     * @param target A jQuery object or a Widget instance.
-     */
-    insertAfter: function(target) {
-        var self = this;
-        return this._render_and_insert(function(t) {
-            self.$element.insertAfter(t);
-        }, target);
-    },
-    /**
-     * Renders the current widget and inserts it before to the given jQuery object or Widget.
-     *
-     * @param target A jQuery object or a Widget instance.
-     */
-    insertBefore: function(target) {
-        var self = this;
-        return this._render_and_insert(function(t) {
-            self.$element.insertBefore(t);
-        }, target);
-    },
-    /**
-     * Renders the current widget and replaces the given jQuery object.
-     *
-     * @param target A jQuery object or a Widget instance.
-     */
-    replace: function(target) {
-        return this._render_and_insert(_.bind(function(t) {
-            this.$element.replaceAll(t);
-        }, this), target);
-    },
-    _render_and_insert: function(insertion, target) {
-        this.render_element();
-        if (target instanceof openerp.web.Widget)
-            target = target.$element;
-        insertion(target);
-        this.on_inserted(this.$element, this);
-        return this.start();
-    },
-    on_inserted: function(element, widget) {},
     /**
      * Renders the element. The default implementation renders the widget using QWeb,
      * `this.template` must be defined. The context given to QWeb contains the "widget"
@@ -1098,18 +1017,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(niv.ParentedMixin).exten
             this.$element = elem;
         }
     },
-    /**
-     * Method called after rendering. Mostly used to bind actions, perform asynchronous
-     * calls, etc...
-     *
-     * By convention, the method should return a promise to inform the caller when
-     * this widget has been initialized.
-     *
-     * @returns {jQuery.Deferred}
-     */
-    start: function() {
-        return $.Deferred().done().promise();
-    },
     /**
      * Informs the action manager to do an action. This supposes that
      * the action manager can be found amongst the ancestors of the current widget.
@@ -1133,7 +1040,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(niv.ParentedMixin).exten
         }
         return false;
     },
-
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
@@ -1146,7 +1052,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(niv.ParentedMixin).exten
         });
         return def.promise();
     }
-});
+}));
 
 /**
  * @deprecated use :class:`openerp.web.Widget`
-- 
cgit v1.2.3


From b6f93c8fa600b227ed6266e11c91fc7cecde36fa Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 24 Feb 2012 14:58:59 +0100
Subject: [fix] some bugs providing the web client to work

bzr revid: nicolas.vanhoren@openerp.com-20120224135859-w937wgm51328dbk1
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 9a564c653bb..7b88279cf16 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -999,7 +999,7 @@ openerp.web.Widget = niv.Widget.extend(_.extend({}, openerp.web.CallbackEnabledM
      */
     init: function(parent) {
         openerp.web.CallbackEnabledMixin.init.call(this);
-        this._super();
+        this._super(parent);
         this.session = openerp.connection;
     },
     /**
-- 
cgit v1.2.3


From 4ff154c30856f5ed80589015bf0552a3852f0a9f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 24 Feb 2012 15:51:04 +0100
Subject: [imp] switched openerp's class to lib's class

bzr revid: nicolas.vanhoren@openerp.com-20120224145104-iues3wzd4inwywpd
---
 addons/web/static/src/js/core.js | 104 +--------------------------------------
 1 file changed, 1 insertion(+), 103 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 7b88279cf16..93b9a237bf0 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -10,110 +10,8 @@ if (!console.debug) {
 }
 
 openerp.web.core = function(openerp) {
-/**
- * John Resig Class with factory improvement
- */
-(function() {
-    var initializing = false,
-        fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
-    // The web Class implementation (does nothing)
-    /**
-     * Extended version of John Resig's Class pattern
-     *
-     * @class
-     */
-    openerp.web.Class = function(){};
-
-    /**
-     * Subclass an existing class
-     *
-     * @param {Object} prop class-level properties (class attributes and instance methods) to set on the new class
-     */
-    openerp.web.Class.extend = function(prop) {
-        var _super = this.prototype;
-
-        // Instantiate a web class (but only create the instance,
-        // don't run the init constructor)
-        initializing = true;
-        var prototype = new this();
-        initializing = false;
-
-        // Copy the properties over onto the new prototype
-        for (var name in prop) {
-            // Check if we're overwriting an existing function
-            prototype[name] = typeof prop[name] == "function" &&
-                              typeof _super[name] == "function" &&
-                              fnTest.test(prop[name]) ?
-                    (function(name, fn) {
-                        return function() {
-                            var tmp = this._super;
-
-                            // Add a new ._super() method that is the same
-                            // method but on the super-class
-                            this._super = _super[name];
-
-                            // The method only need to be bound temporarily, so
-                            // we remove it when we're done executing
-                            var ret = fn.apply(this, arguments);
-                            this._super = tmp;
 
-                            return ret;
-                        };
-                    })(name, prop[name]) :
-                    prop[name];
-        }
-
-        // The dummy class constructor
-        function Class() {
-            // All construction is actually done in the init method
-            if (!initializing && this.init) {
-                var ret = this.init.apply(this, arguments);
-                if (ret) { return ret; }
-            }
-            return this;
-        }
-        Class.include = function (properties) {
-            for (var name in properties) {
-                if (typeof properties[name] !== 'function'
-                        || !fnTest.test(properties[name])) {
-                    prototype[name] = properties[name];
-                } else if (typeof prototype[name] === 'function'
-                           && prototype.hasOwnProperty(name)) {
-                    prototype[name] = (function (name, fn, previous) {
-                        return function () {
-                            var tmp = this._super;
-                            this._super = previous;
-                            var ret = fn.apply(this, arguments);
-                            this._super = tmp;
-                            return ret;
-                        }
-                    })(name, properties[name], prototype[name]);
-                } else if (typeof _super[name] === 'function') {
-                    prototype[name] = (function (name, fn) {
-                        return function () {
-                            var tmp = this._super;
-                            this._super = _super[name];
-                            var ret = fn.apply(this, arguments);
-                            this._super = tmp;
-                            return ret;
-                        }
-                    })(name, properties[name]);
-                }
-            }
-        };
-
-        // Populate our constructed prototype object
-        Class.prototype = prototype;
-
-        // Enforce the constructor to be what we expect
-        Class.constructor = Class;
-
-        // And make this class extendable
-        Class.extend = arguments.callee;
-
-        return Class;
-    };
-})();
+openerp.web.Class = niv.Class;
 
 openerp.web.callback = function(obj, method) {
     var callback = function() {
-- 
cgit v1.2.3


From 7969c1f08003382aa9c3102b79ad2b68da6c3301 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 24 Feb 2012 15:54:33 +0100
Subject: [fix] renammed bind to session_bind

bzr revid: nicolas.vanhoren@openerp.com-20120224145433-c5bunu2fuciqj2uc
---
 addons/web/static/src/js/chrome.js | 4 ++--
 addons/web/static/src/js/core.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 060abeefc2c..73ea24b1b31 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1090,7 +1090,7 @@ openerp.web.WebClient = openerp.web.OldWidget.extend(/** @lends openerp.web.WebC
                 self.$element.toggleClass('clark-gable');
             });
         }
-        this.session.bind().then(function() {
+        this.session.bind_session().then(function() {
             if (!self.session.session_is_valid()) {
                 self.show_login();
             }
@@ -1258,7 +1258,7 @@ openerp.web.embed = function (origin, dbname, login, key, action, options) {
         var sc = document.getElementsByTagName('script');
         currentScript = sc[sc.length-1];
     }
-    openerp.connection.bind(origin).then(function () {
+    openerp.connection.bind_session(origin).then(function () {
         openerp.connection.session_authenticate(dbname, login, key, true).then(function () {
             var client = new openerp.web.EmbeddedClient(action, options);
             client.insertAfter(currentScript);
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 93b9a237bf0..da100c19241 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -322,7 +322,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.name = openerp._session_id;
         this.qweb_mutex = new $.Mutex();
     },
-    bind: function(origin) {
+    bind_session: function(origin) {
         var window_origin = location.protocol+"//"+location.host, self=this;
         this.origin = origin ? _.str.rtrim(origin,'/') : window_origin;
         this.prefix = this.origin;
-- 
cgit v1.2.3


From 739f719ad6f26c007deb6b48134734588538bcbe Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Feb 2012 08:37:21 +0100
Subject: [UP] py.parse 0.2 to py.js 0.4                                       
                                                                              
   ~

should probably go through a testing phase (checking its result
against that of eval_domain_and_context) for a while, but apart from
that it's supposed to work.

'stdlib' stuff (datetime.date.today, datetime.timedelta,
time.localtime, time.time, time.strftime) still need to be
written. Isn't there also a dateutil.relativedeleta somewhere?

Anyway that needs to be done and the various evaluation contexts need
to be defined, but the valuator itself should mostly work.

bzr revid: xmo@openerp.com-20120227073721-nkgeiqacbzch8xev
---
 addons/web/static/src/js/core.js      | 2 +-
 addons/web/static/src/js/view_list.js | 2 +-
 addons/web/static/src/js/view_tree.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index f02efc07173..7c2a3876e42 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1237,7 +1237,7 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.we
         if (translation_bundle.lang_parameters) {
             this.parameters = translation_bundle.lang_parameters;
             this.parameters.grouping = py.eval(
-                    this.parameters.grouping).toJSON();
+                    this.parameters.grouping);
         }
     },
     add_module_translation: function(mod) {
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 2394e12eb4d..30654da0c7d 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -158,7 +158,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             var pair = this.colors[i],
                 color = pair[0],
                 expression = pair[1];
-            if (py.evaluate(expression, _.extend({bool: py.bool}, context))) {
+            if (py.evaluate(expression, context).toJSON()) {
                 return 'color: ' + color + ';';
             }
             // TODO: handle evaluation errors
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index dea53793ffb..1c6694ed930 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -146,7 +146,7 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
             var pair = this.colors[i],
                 color = pair[0],
                 expression = pair[1];
-            if (py.evaluate(expression, _.extend({bool: py.bool}, context))) {
+            if (py.evaluate(expression, context).toJSON()) {
                 return 'color: ' + color + ';';
             }
             // TODO: handle evaluation errors
-- 
cgit v1.2.3


From f23a5914cab7ea8039f2b42bc5f279152ed5e31a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 27 Feb 2012 10:34:13 +0100
Subject: [imp] cleaned initialization of mixins

bzr revid: nicolas.vanhoren@openerp.com-20120227093413-8qp1vo90500h9lrw
---
 addons/web/static/src/js/core.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index da100c19241..e4d426ac4a0 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -261,10 +261,6 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
 });
 
 openerp.web.CallbackEnabledMixin = {
-    /**
-     * @constructs openerp.web.CallbackEnabled
-     * @extends openerp.web.Class
-     */
     init: function() {
         // Transform on_* method into openerp.web.callbacks
         for (var name in this) {
@@ -304,7 +300,12 @@ openerp.web.CallbackEnabledMixin = {
     }
 };
 
-openerp.web.CallbackEnabled = openerp.web.Class.extend(_.extend({}, openerp.web.CallbackEnabledMixin));
+openerp.web.CallbackEnabled = openerp.web.Class.extend(_.extend({}, niv.GetterSetterMixin, openerp.web.CallbackEnabledMixin, {
+    init: function() {
+        niv.GetterSetterMixin.init.call(this);
+        openerp.web.CallbackEnabledMixin.init.call(this);
+    }
+}));
 
 openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
     /**
-- 
cgit v1.2.3


From 080c9ed7fd7e782a3d2ae41747f0a80204ce2d5e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 27 Feb 2012 11:37:15 +0100
Subject: [imp] renammed niv to nova

bzr revid: nicolas.vanhoren@openerp.com-20120227103715-ez6m5bth0spbuupk
---
 addons/web/static/src/js/core.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index e4d426ac4a0..bdc8059ff63 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -11,7 +11,7 @@ if (!console.debug) {
 
 openerp.web.core = function(openerp) {
 
-openerp.web.Class = niv.Class;
+openerp.web.Class = nova.Class;
 
 openerp.web.callback = function(obj, method) {
     var callback = function() {
@@ -300,9 +300,9 @@ openerp.web.CallbackEnabledMixin = {
     }
 };
 
-openerp.web.CallbackEnabled = openerp.web.Class.extend(_.extend({}, niv.GetterSetterMixin, openerp.web.CallbackEnabledMixin, {
+openerp.web.CallbackEnabled = openerp.web.Class.extend(_.extend({}, nova.GetterSetterMixin, openerp.web.CallbackEnabledMixin, {
     init: function() {
-        niv.GetterSetterMixin.init.call(this);
+        nova.GetterSetterMixin.init.call(this);
         openerp.web.CallbackEnabledMixin.init.call(this);
     }
 }));
@@ -874,7 +874,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = niv.Widget.extend(_.extend({}, openerp.web.CallbackEnabledMixin, {
+openerp.web.Widget = nova.Widget.extend(_.extend({}, openerp.web.CallbackEnabledMixin, {
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -897,8 +897,8 @@ openerp.web.Widget = niv.Widget.extend(_.extend({}, openerp.web.CallbackEnabledM
      * for new components this argument should not be provided any more.
      */
     init: function(parent) {
-        openerp.web.CallbackEnabledMixin.init.call(this);
         this._super(parent);
+        openerp.web.CallbackEnabledMixin.init.call(this);
         this.session = openerp.connection;
     },
     /**
-- 
cgit v1.2.3


From aca64bb558ebe2b617620eb62678107dccce971a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 27 Feb 2012 13:49:58 +0100
Subject: [imp] removed useless function

bzr revid: nicolas.vanhoren@openerp.com-20120227124958-ehlps91290hrwo9o
---
 addons/web/static/src/js/core.js | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index bdc8059ff63..6ff8f86dcc3 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -72,31 +72,6 @@ openerp.web.callback = function(obj, method) {
     });
 };
 
-/**
- * Generates an inherited class that replaces all the methods by null methods (methods
- * that does nothing and always return undefined).
- *
- * @param {Class} claz
- * @param {Object} add Additional functions to override.
- * @return {Class}
- */
-openerp.web.generate_null_object_class = function(claz, add) {
-    var newer = {};
-    var copy_proto = function(prototype) {
-        for (var name in prototype) {
-            if(typeof prototype[name] == "function") {
-                newer[name] = function() {};
-            }
-        }
-        if (prototype.prototype)
-            copy_proto(prototype.prototype);
-    };
-    copy_proto(claz.prototype);
-    newer.init = openerp.web.Widget.prototype.init;
-    var tmpclass = claz.extend(newer);
-    return tmpclass.extend(add || {});
-};
-
 /**
  * web error for lookup failure
  *
-- 
cgit v1.2.3


From e91dee1e97d5b7f371ee2ab86c77d4067d6e4af9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 27 Feb 2012 14:45:31 +0100
Subject: [ADD] Added shortcut to dropdown menu. Completely removed old Header

bzr revid: fme@openerp.com-20120227134531-uf646x2w13zqsslz
---
 addons/web/static/src/js/chrome.js | 318 +++++++++++++++----------------------
 1 file changed, 127 insertions(+), 191 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 838fdb4f79f..ff474528814 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -666,186 +666,6 @@ openerp.web.Login =  openerp.web.OldWidget.extend(/** @lends openerp.web.Login#
     }
 });
 
-openerp.web.Header =  openerp.web.OldWidget.extend(/** @lends openerp.web.Header# */{
-    template: "Header",
-    /**
-     * @constructs openerp.web.Header
-     * @extends openerp.web.OldWidget
-     *
-     * @param parent
-     */
-    init: function(parent) {
-        this._super(parent);
-        this.qs = "?" + jQuery.param.querystring();
-        this.$content = $();
-        this.update_promise = $.Deferred().resolve();
-    },
-    start: function() {
-        this._super();
-    },
-    do_update: function () {
-        var self = this;
-        var fct = function() {
-            self.$content.remove();
-            if (!self.session.uid)
-                return;
-            var func = new openerp.web.Model("res.users").get_func("read");
-            return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
-                self.$content = $(QWeb.render("Header-content", {widget: self, user: res}));
-                self.$content.appendTo(self.$element);
-                self.$element.find(".logout").click(self.on_logout);
-                self.$element.find("a.preferences").click(self.on_preferences);
-                self.$element.find(".about").click(self.on_about);
-                return self.shortcut_load();
-            });
-        };
-        this.update_promise = this.update_promise.pipe(fct, fct);
-    },
-    on_about: function() {
-        var self = this;
-        self.rpc("/web/webclient/version_info", {}).then(function(res) {
-            var $help = $(QWeb.render("About-Page", {version_info: res}));
-            $help.find('a.oe_activate_debug_mode').click(function (e) {
-                e.preventDefault();
-                window.location = $.param.querystring(
-                        window.location.href, 'debug');
-            });
-            openerp.web.dialog($help, {autoOpen: true,
-                modal: true, width: 960, title: _t("About")});
-        });
-    },
-    shortcut_load :function(){
-        var self = this,
-            sc = self.session.shortcuts,
-            shortcuts_ds = new openerp.web.DataSet(this, 'ir.ui.view_sc');
-        // TODO: better way to communicate between sections.
-        // sc.bindings, because jquery does not bind/trigger on arrays...
-        if (!sc.binding) {
-            sc.binding = {};
-            $(sc.binding).bind({
-                'add': function (e, attrs) {
-                    shortcuts_ds.create(attrs, function (out) {
-                        $('<li>', {
-                            'data-shortcut-id':out.result,
-                            'data-id': attrs.res_id
-                        }).text(attrs.name)
-                          .appendTo(self.$element.find('.oe-shortcuts ul'));
-                        attrs.id = out.result;
-                        sc.push(attrs);
-                    });
-                },
-                'remove-current': function () {
-                    var menu_id = self.session.active_id;
-                    var $shortcut = self.$element
-                        .find('.oe-shortcuts li[data-id=' + menu_id + ']');
-                    var shortcut_id = $shortcut.data('shortcut-id');
-                    $shortcut.remove();
-                    shortcuts_ds.unlink([shortcut_id]);
-                    var sc_new = _.reject(sc, function(shortcut){ return shortcut_id === shortcut.id});
-                    sc.splice(0, sc.length);
-                    sc.push.apply(sc, sc_new);
-                    }
-            });
-        }
-        return this.rpc('/web/session/sc_list', {}, function(shortcuts) {
-            sc.splice(0, sc.length);
-            sc.push.apply(sc, shortcuts);
-
-            self.$element.find('.oe-shortcuts')
-                .html(QWeb.render('Shortcuts', {'shortcuts': shortcuts}))
-                .undelegate('li', 'click')
-
-                .delegate('li', 'click', function(e) {
-                    e.stopPropagation();
-                    var id = $(this).data('id');
-                    self.session.active_id = id;
-                    self.rpc('/web/menu/action', {'menu_id':id}, function(ir_menu_data) {
-                        if (ir_menu_data.action.length){
-                            self.on_action(ir_menu_data.action[0][2]);
-                        }
-                    });
-                });
-        });
-    },
-
-    on_action: function(action) {
-    },
-    on_preferences: function(){
-        var self = this;
-        var action_manager = new openerp.web.ActionManager(this);
-        var dataset = new openerp.web.DataSet (this,'res.users',this.context);
-        dataset.call ('action_get','',function (result){
-            self.rpc('/web/action/load', {action_id:result}, function(result){
-                action_manager.do_action(_.extend(result['result'], {
-                    res_id: self.session.uid,
-                    res_model: 'res.users',
-                    flags: {
-                        action_buttons: false,
-                        search_view: false,
-                        sidebar: false,
-                        views_switcher: false,
-                        pager: false
-                    }
-                }));
-            });
-        });
-        this.dialog = new openerp.web.Dialog(this,{
-            title: _t("Preferences"),
-            width: '700px',
-            buttons: [
-                {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
-                {text: _t("Change password"), click: function(){ self.change_password(); }},
-                {text: _t("Save"), click: function(){
-                        var inner_viewmanager = action_manager.inner_viewmanager;
-                        inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save()
-                        .then(function() {
-                            self.dialog.destroy();
-                            // needs to refresh interface in case language changed
-                            window.location.reload();
-                        });
-                    }
-                }
-            ]
-        }).open();
-       action_manager.appendTo(this.dialog);
-       action_manager.render(this.dialog);
-    },
-
-    change_password :function() {
-        var self = this;
-        this.dialog = new openerp.web.Dialog(this, {
-            title: _t("Change Password"),
-            width : 'auto'
-        }).open();
-        this.dialog.$element.html(QWeb.render("Change_Pwd", self));
-        this.dialog.$element.find("form[name=change_password_form]").validate({
-            submitHandler: function (form) {
-                self.rpc("/web/session/change_password",{
-                    'fields': $(form).serializeArray()
-                }, function(result) {
-                    if (result.error) {
-                        self.display_error(result);
-                        return;
-                    } else {
-                        openerp.webclient.on_logout();
-                    }
-                });
-            }
-        });
-    },
-    display_error: function (error) {
-        return openerp.web.dialog($('<div>'), {
-            modal: true,
-            title: error.title,
-            buttons: [
-                {text: _("Ok"), click: function() { $(this).dialog("close"); }}
-            ]
-        }).html(error.error);
-    },
-    on_logout: function() {
-    }
-});
-
 openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     /**
      * @constructs openerp.web.Menu
@@ -1008,16 +828,17 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     }
 });
 
-openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.Header# */{
+openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.DropDownMenu# */{
     template: "DropDownMenu",
     /**
      * @constructs openerp.web.DropDownMenu
-     * @extends openerp.web.OldWidget
+     * @extends openerp.web.Widget
      *
      * @param parent
      */
     init: function(parent) {
         this._super(parent);
+        this.update_promise = $.Deferred().resolve();
     },
     start: function() {
         var self = this;
@@ -1029,13 +850,108 @@ openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.Hea
             self.$element.find('.oe_dropdown_options').toggle();
             return false;
         });
-        this.$element.find('.oe_dropdown_options li a').click(function() {
+        this.$element.on('click', '.oe_dropdown_options li a[data-menu]', function() {
             var f = self['on_menu_' + $(this).data('menu')];
-            f && f();
+            f && f($(this));
             self.$element.find('.oe_dropdown_options').hide();
             return false;
         });
     },
+    change_password :function() {
+        var self = this;
+        this.dialog = new openerp.web.Dialog(this, {
+            title: _t("Change Password"),
+            width : 'auto'
+        }).open();
+        this.dialog.$element.html(QWeb.render("Change_Pwd", self));
+        this.dialog.$element.find("form[name=change_password_form]").validate({
+            submitHandler: function (form) {
+                self.rpc("/web/session/change_password",{
+                    'fields': $(form).serializeArray()
+                }, function(result) {
+                    if (result.error) {
+                        self.display_error(result);
+                        return;
+                    } else {
+                        openerp.webclient.on_logout();
+                    }
+                });
+            }
+        });
+    },
+    display_error: function (error) {
+        return openerp.web.dialog($('<div>'), {
+            modal: true,
+            title: error.title,
+            buttons: [
+                {text: _("Ok"), click: function() { $(this).dialog("close"); }}
+            ]
+        }).html(error.error);
+    },
+    do_update: function () {
+        var self = this;
+        var fct = function() {
+            var $avatar = self.$element.find('.oe_topbar_avatar');
+            $avatar.attr('src', $avatar.data('default-src'));
+            if (!self.session.uid)
+                return;
+            var func = new openerp.web.Model("res.users").get_func("read");
+            return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
+                // TODO: Only show company if multicompany in use
+                self.$element.find('.oe_topbar_name').text(res.name + '/' + res.company_id[1]);
+                return self.shortcut_load();
+            });
+        };
+        this.update_promise = this.update_promise.pipe(fct, fct);
+    },
+    on_action: function() {
+    },
+    shortcut_load :function(){
+        var self = this,
+            sc = self.session.shortcuts,
+            shortcuts_ds = new openerp.web.DataSet(this, 'ir.ui.view_sc');
+        self.$element.find('.oe_dropdown_options a[data-menu=shortcut]').each(function() {
+            $(this).parent().remove();
+        });
+        // TODO: better way to communicate between sections.
+        // sc.bindings, because jquery does not bind/trigger on arrays...
+        if (!sc.binding) {
+            sc.binding = {};
+            $(sc.binding).bind({
+                'add': function (e, attrs) {
+                    shortcuts_ds.create(attrs, function (out) {
+                        var shortcut = QWeb.render('DropDownMenu.shortcut', {
+                            shortcuts : [{
+                                name : attrs.name,
+                                id : out.result,
+                                res_id : attrs.res_id
+                            }]
+                        });
+                        $(shortcut).appendTo(self.$element.find('.oe_dropdown_options'));
+                        attrs.id = out.result;
+                        sc.push(attrs);
+                    });
+                },
+                'remove-current': function () {
+                    var menu_id = self.session.active_id;
+                    var $shortcut = self.$element.find('.oe_dropdown_options li a[data-id=' + menu_id + ']');
+                    var shortcut_id = $shortcut.data('shortcut-id');
+                    $shortcut.remove();
+                    shortcuts_ds.unlink([shortcut_id]);
+                    var sc_new = _.reject(sc, function(shortcut){ return shortcut_id === shortcut.id});
+                    sc.splice(0, sc.length);
+                    sc.push.apply(sc, sc_new);
+                }
+            });
+        }
+        return this.rpc('/web/session/sc_list', {}, function(shortcuts) {
+            sc.splice(0, sc.length);
+            sc.push.apply(sc, shortcuts);
+
+            $(QWeb.render('DropDownMenu.shortcut', {'shortcuts': shortcuts}))
+                .appendTo(self.$element.find('.oe_dropdown_options'));
+        });
+    },
     on_menu_logout: function() {
     },
     on_menu_settings: function() {
@@ -1077,6 +993,29 @@ openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.Hea
         }).open();
        action_manager.appendTo(this.dialog);
        action_manager.render(this.dialog);
+    },
+    on_menu_about: function() {
+        var self = this;
+        self.rpc("/web/webclient/version_info", {}).then(function(res) {
+            var $help = $(QWeb.render("About-Page", {version_info: res}));
+            $help.find('a.oe_activate_debug_mode').click(function (e) {
+                e.preventDefault();
+                window.location = $.param.querystring(
+                        window.location.href, 'debug');
+            });
+            openerp.web.dialog($help, {autoOpen: true,
+                modal: true, width: 960, title: _t("About")});
+        });
+    },
+    on_menu_shortcut: function($link) {
+        var self = this,
+            id = $link.data('id');
+        self.session.active_id = id;
+        self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
+            if (ir_menu_data.action.length){
+                self.on_action(ir_menu_data.action[0][2]);
+            }
+        });
     }
 });
 
@@ -1089,7 +1028,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         var self = this;
         this._super(parent);
         openerp.webclient = this;
-
+        this.querystring = '?' + jQuery.param.querystring();
         this._current_state = null;
     },
     start: function() {
@@ -1108,8 +1047,8 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         });
         this.session.on_session_valid.add(function() {
             self.show_application();
-            
-            self.header.do_update();
+
+            self.dropdown_menu.do_update();
             self.menu.do_reload();
             if(self.action_manager)
                 self.action_manager.destroy();
@@ -1136,16 +1075,13 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.show_common();
         self.$table = $(QWeb.render("WebClient", {}));
         self.$element.append(self.$table);
-        self.header = new openerp.web.Header(self);
-        self.header.on_logout.add(this.proxy('on_logout'));
-        self.header.on_action.add(this.proxy('on_menu_action'));
-        self.header.appendTo($("#oe_header"));
         self.menu = new openerp.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on_action.add(this.proxy('on_menu_action'));
         self.dropdown_menu = new openerp.web.DropDownMenu(self);
         self.dropdown_menu.replace(this.$element.find('.oe_dropdown_menu_placeholder'));
         self.dropdown_menu.on_menu_logout.add(this.proxy('on_logout'));
+        self.dropdown_menu.on_action.add(this.proxy('on_menu_action'));
     },
     show_common: function() {
         var self = this;
-- 
cgit v1.2.3


From ad681179d0e2b8ee95c085b2131cd9a7e426eb40 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 27 Feb 2012 14:59:11 +0100
Subject: [CHG] Menu doesn't fold by default

bzr revid: fme@openerp.com-20120227135911-9l0csum251wvkfv8
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ff474528814..56acb939b7d 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -791,7 +791,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
             if ($clicked_menu.is('.submenu')) {
                 $sub_menu.find('.submenu.opened').each(function() {
                     if (!$(this).next().has($clicked_menu).length && !$(this).is($clicked_menu)) {
-                        $(this).removeClass('opened').next().hide();
+                        $(this).removeClass('opened');
                     }
                 });
                 $clicked_menu.toggleClass('opened').next().toggle();
-- 
cgit v1.2.3


From 481baac8a3d592440c4263cb7a12435e1914125c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 27 Feb 2012 15:01:36 +0100
Subject: [CHG] Do not toggle opened class on submenu (should be part of last
 commit)

bzr revid: fme@openerp.com-20120227140136-k4g3kiots78ef4iv
---
 addons/web/static/src/js/chrome.js | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 56acb939b7d..9b8ef61fc3a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -789,11 +789,6 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
 
         if ($main_menu != $clicked_menu) {
             if ($clicked_menu.is('.submenu')) {
-                $sub_menu.find('.submenu.opened').each(function() {
-                    if (!$(this).next().has($clicked_menu).length && !$(this).is($clicked_menu)) {
-                        $(this).removeClass('opened');
-                    }
-                });
                 $clicked_menu.toggleClass('opened').next().toggle();
             } else if ($clicked_menu.is('.leaf')) {
                 return true;
-- 
cgit v1.2.3


From 2b2ae48ea9538731a70d16e7b8618ed894d78464 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Feb 2012 16:27:39 +0100
Subject: [FIX] progressbar fields display in group headers

also, weird computed progress bars (e.g. aggregates) with way too many digits

lp bug: https://launchpad.net/bugs/941316 fixed

bzr revid: xmo@openerp.com-20120227152739-3pmu3dtqrbzx1x3m
---
 addons/web/static/src/js/formats.js   | 2 +-
 addons/web/static/src/js/view_list.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 4fb576e4a90..90d95f70ec5 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -336,7 +336,7 @@ openerp.web.format_cell = function (row_data, column, options) {
     case 'progressbar':
         return _.template(
             '<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
-                value: row_data[column.id].value
+                value: _.str.sprintf("%.0f", row_data[column.id].value)
             });
     }
 
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index ec8e6a17c87..d2e421b2fde 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1257,9 +1257,11 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                     if (column.meta) {
                         // do not do anything
                     } else if (column.id in group.aggregates) {
-                        var value = group.aggregates[column.id];
+                        var r = {};
+                        r[column.id] = {value: group.aggregates[column.id]};
                         $('<td class="oe-number">')
-                            .html(openerp.web.format_value(value, column))
+                            .html(openerp.web.format_cell(
+                                r, column, {process_modifiers: false}))
                             .appendTo($row);
                     } else {
                         $row.append('<td>');
-- 
cgit v1.2.3


From 4b74a35c76b3a042d893976bc6cf2e63b653af05 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Feb 2012 11:12:00 +0100
Subject: [FIX] list paginator's 'last page' button: not all state was
 transferred between datasets during paginator configuration

lp bug: https://launchpad.net/bugs/939614 fixed

bzr revid: xmo@openerp.com-20120228101200-atisgrb2fb0eqi1g
---
 addons/web/static/src/js/view_list.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index d2e421b2fde..c44b62d08f2 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -291,6 +291,10 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      */
     configure_pager: function (dataset) {
         this.dataset.ids = dataset.ids;
+        // Not exactly clean
+        if (dataset._length) {
+            this.dataset._length = dataset._length;
+        }
 
         var limit = this.limit(),
             total = dataset.size(),
-- 
cgit v1.2.3


From 2d03b80c7dcb5d65973a0ea383df72416dbb66ac Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Feb 2012 14:41:21 +0100
Subject: [IMP] New menus

bzr revid: fme@openerp.com-20120228134121-bxs33qrpevrfkctp
---
 addons/web/static/src/js/chrome.js | 117 ++++++++++++-------------------------
 1 file changed, 37 insertions(+), 80 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 9b8ef61fc3a..29751eba313 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -685,12 +685,14 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     on_loaded: function(data) {
         this.data = data;
         this.render_element();
-        if (!this.$secondary_menu && this.getParent()) {
+        if (!this.$secondary_menus && this.getParent()) {
             // TODO: create Widget openerp.web.SubMenu
-            this.$secondary_menu = this.getParent().$element.find('.oe_secondary_menu');
+            this.$secondary_menus = this.getParent().$element.find('.oe_secondary_menus_container');
+            this.$element.add(this.$secondary_menus).on('click', 'a[data-menu]', this.on_menu_click);
         }
-        this.$secondary_menu.html(QWeb.render("Menu.secondary", { widget : this }));
-        this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
+        this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this }));
+        // Hide second level submenus
+        this.$secondary_menus.find('.oe_menu_toggler').siblings('.oe_secondary_submenu').hide();
     },
     /**
      * Opens a given menu by id, as if a user had browsed to that menu by hand
@@ -698,39 +700,36 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
      *
      * @param {Number} menu_id database id of the terminal menu to select
      */
-    open_menu: function (menu_id) {
-        this.$element.add(this.$secondary_menu).find('.oe_active')
-                .removeClass('oe_active');
-        this.$secondary_menu.find('> .oe_secondary_menu').hide();
+    open_menu: function (id) {
+        var $clicked_menu, $sub_menu, $main_menu;
+        $clicked_menu = this.$element.add(this.$secondary_menus).find('a[data-menu=' + id + ']');
 
-        var $primary_menu;
-        var $secondary_submenu = this.$secondary_menu.find(
-                'a[data-menu=' + menu_id +']');
-        if ($secondary_submenu.length) {
-            for(;;) {
-                if ($secondary_submenu.hasClass('leaf')) {
-                    $secondary_submenu.addClass('oe_active');
-                } else if ($secondary_submenu.hasClass('submenu')) {
-                    $secondary_submenu.addClass('opened')
-                }
-                var $parent = $secondary_submenu.parent().show();
-                if ($parent.hasClass('oe_secondary_menu')) {
-                    var primary_id = $parent.data('menu-parent');
-                    $primary_menu = this.$element.find(
-                            'a[data-menu=' + primary_id + ']');
-                    break;
-                }
-                $secondary_submenu = $parent.prev();
-            }
+        if (this.$secondary_menus.has($clicked_menu).length) {
+            $sub_menu = $clicked_menu.parents('.oe_secondary_menu');
+            $main_menu = this.$element.find('a[data-menu=' + $sub_menu.data('menu-parent') + ']');
         } else {
-            $primary_menu = this.$element.find('a[data-menu=' + menu_id + ']');
+            $sub_menu = this.$secondary_menus.find('.oe_secondary_menu[data-menu-parent=' + $clicked_menu.attr('data-menu') + ']');
+            $main_menu = $clicked_menu;
         }
-        if (!$primary_menu.length) {
-            return;
+
+        // Activate current main menu
+        this.$element.find('.oe_active').removeClass('oe_active');
+        $main_menu.addClass('oe_active');
+
+        // Show current sub menu
+        this.$secondary_menus.find('.oe_secondary_menu').hide();
+        $sub_menu.show();
+
+        // Activate current menu item and show parents
+        this.$secondary_menus.find('.oe_active').removeClass('oe_active');
+        if ($main_menu !== $clicked_menu) {
+            $clicked_menu.parents().show();
+            if ($clicked_menu.is('.oe_menu_toggler')) {
+                $clicked_menu.toggleClass('oe_menu_opened').siblings('.oe_secondary_submenu:first').toggle();
+            } else {
+                $clicked_menu.parent().addClass('oe_active');
+            }
         }
-        $primary_menu.addClass('oe_active');
-        this.$secondary_menu.find(
-            'div[data-menu-parent=' + $primary_menu.data('menu') + ']').addClass('oe_active');
     },
     on_menu_click: function(ev, id) {
         id = id || 0;
@@ -741,14 +740,15 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
             manual = true;
             $clicked_menu = this.$element.find('a[data-menu=' + id + ']');
             if (!$clicked_menu.length) {
-                $clicked_menu = this.$secondary_menu.find('a[data-menu=' + id + ']');
+                $clicked_menu = this.$secondary_menus.find('a[data-menu=' + id + ']');
             }
         } else {
             $clicked_menu = $(ev.currentTarget);
             id = $clicked_menu.data('menu');
         }
 
-        if (this.do_menu_click($clicked_menu, manual) && id) {
+        if (id) {
+            this.open_menu(id);
             this.current_menu = id;
             this.session.active_id = id;
             this.rpc('/web/menu/action', {'menu_id': id}, this.on_menu_action_loaded);
@@ -758,52 +758,9 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         }
         return false;
     },
-    do_menu_click: function($clicked_menu, manual) {
-        var $sub_menu, $main_menu,
-            active = $clicked_menu.is('.oe_active'),
-            sub_menu_visible = false,
-            has_submenu_items = false;
-
-        if (this.$secondary_menu.has($clicked_menu).length) {
-            $sub_menu = $clicked_menu.parents('.oe_secondary_menu');
-            $main_menu = this.$element.find('a[data-menu=' + $sub_menu.data('menu-parent') + ']');
-        } else {
-            $sub_menu = this.$secondary_menu.find('.oe_secondary_menu[data-menu-parent=' + $clicked_menu.attr('data-menu') + ']');
-            $main_menu = $clicked_menu;
-        }
-
-        sub_menu_visible = $sub_menu.is(':visible');
-        has_submenu_items = !!$sub_menu.children().length;
-        this.$secondary_menu.find('.oe_secondary_menu').hide();
-
-        $('.oe_active', this.$element.add(this.$secondary_menu)).removeClass('oe_active');
-        $main_menu.add($clicked_menu).add($sub_menu).addClass('oe_active');
-
-        if (has_submenu_items) {
-            if (!manual) {
-                this.do_show_secondary($sub_menu, $main_menu);
-            } else {
-                this.do_show_secondary();
-            }
-        }
-
-        if ($main_menu != $clicked_menu) {
-            if ($clicked_menu.is('.submenu')) {
-                $clicked_menu.toggleClass('opened').next().toggle();
-            } else if ($clicked_menu.is('.leaf')) {
-                return true;
-            }
-        } else {
-            return true;
-        }
-        return false;
-    },
-    do_hide_secondary: function() {
-        //this.$secondary_menu.hide();
-    },
     do_show_secondary: function($sub_menu, $main_menu) {
         var self = this;
-        this.$secondary_menu.show();
+        this.$secondary_menus.show();
         if (!arguments.length) {
             return;
         }
@@ -1048,7 +1005,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             if(self.action_manager)
                 self.action_manager.destroy();
             self.action_manager = new openerp.web.ActionManager(self);
-            self.action_manager.appendTo($("#oe_app"));
+            self.action_manager.appendTo(self.$element.find('.oe_application'));
             self.bind_hashchange();
             var version_label = _t("OpenERP - Unsupported/Community Version");
             if (!self.session.openerp_entreprise) {
-- 
cgit v1.2.3


From 74efca03cc290173484dea4c8d78d74e2d7a3c7a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 28 Feb 2012 15:40:24 +0100
Subject: [fix] minor problem in m2o

lp bug: https://launchpad.net/bugs/923898 fixed

bzr revid: nicolas.vanhoren@openerp.com-20120228144024-ihavt9si03lorzsu
---
 addons/web/static/src/js/view_form.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 17b9849cd42..bee5016f0be 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1938,9 +1938,13 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
                 $cmenu.append(QWeb.render("FieldMany2One.context_menu", {widget: self}));
                 var bindings = {};
                 bindings[self.cm_id + "_search"] = function() {
+                    if (self.readonly)
+                        return;
                     self._search_create_popup("search");
                 };
                 bindings[self.cm_id + "_create"] = function() {
+                    if (self.readonly)
+                        return;
                     self._search_create_popup("form");
                 };
                 bindings[self.cm_id + "_open"] = function() {
-- 
cgit v1.2.3


From 9cad7deeedd6931857e081f2bac85e5e898a3f85 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 28 Feb 2012 15:41:11 +0100
Subject: [fix] minor problem in m2o

lp bug: https://launchpad.net/bugs/923898 fixed

bzr revid: nicolas.vanhoren@openerp.com-20120228144111-co9nl24o466zuzsb
---
 addons/web/static/src/js/view_form.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6b7acd5a244..5bbdefff520 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1911,9 +1911,13 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
                 $cmenu.append(QWeb.render("FieldMany2One.context_menu", {widget: self}));
                 var bindings = {};
                 bindings[self.cm_id + "_search"] = function() {
+                    if (self.readonly)
+                        return;
                     self._search_create_popup("search");
                 };
                 bindings[self.cm_id + "_create"] = function() {
+                    if (self.readonly)
+                        return;
                     self._search_create_popup("form");
                 };
                 bindings[self.cm_id + "_open"] = function() {
-- 
cgit v1.2.3


From 2da29835334266a278e030411d1a3539fc7d11e2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 29 Feb 2012 12:04:28 +0100
Subject: [imp] renammed tag_name

bzr revid: nicolas.vanhoren@openerp.com-20120229110428-es0fof2fxxa5qzd5
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 93e2b06c1f6..bbfac551c5d 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -937,7 +937,7 @@ openerp.web.OldWidget = openerp.web.Widget.extend({
         this.element_id = element_id;
         this.element_id = this.element_id || _.uniqueId('widget-');
         var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : $(document.createElement(this.tag_name));
+        this.$element = tmp ? $(tmp) : $(document.createElement(this.tagName));
     },
     render_element: function() {
         var rendered = this.render();
-- 
cgit v1.2.3


From 7eb12aee74633e4f240b0373eae476788c14ecba Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 29 Feb 2012 12:07:44 +0100
Subject: [imp] renammed render_element

bzr revid: nicolas.vanhoren@openerp.com-20120229110744-0m55gqlme6s225jv
---
 addons/web/static/src/js/chrome.js    |  2 +-
 addons/web/static/src/js/core.js      |  4 ++--
 addons/web/static/src/js/view_form.js | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index de3275f3230..c019d59e7e1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -864,7 +864,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     },
     on_loaded: function(data) {
         this.data = data;
-        this.render_element();
+        this.renderElement();
         if (!this.$secondary_menu && this.getParent()) {
             // TODO: create Widget openerp.web.SubMenu
             this.$secondary_menu = this.getParent().$element.find('.oe_secondary_menu');
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index bbfac551c5d..fe2ca1beb4f 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -881,7 +881,7 @@ openerp.web.Widget = nova.Widget.extend(_.extend({}, openerp.web.CallbackEnabled
      * `this.template` must be defined. The context given to QWeb contains the "widget"
      * key that references `this`.
      */
-    render_element: function() {
+    renderElement: function() {
         var rendered = null;
         if (this.template)
             rendered = openerp.web.qweb.render(this.template, {widget: this});
@@ -939,7 +939,7 @@ openerp.web.OldWidget = openerp.web.Widget.extend({
         var tmp = document.getElementById(this.element_id);
         this.$element = tmp ? $(tmp) : $(document.createElement(this.tagName));
     },
-    render_element: function() {
+    renderElement: function() {
         var rendered = this.render();
         if (rendered) {
             var elem = $(rendered);
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 17b9849cd42..78626f69d8a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -936,7 +936,7 @@ openerp.web.form.Widget = openerp.web.OldWidget.extend(/** @lends openerp.web.fo
     update_dom: function() {
         this.$element.toggle(!this.invisible);
     },
-    render_element: function() {
+    renderElement: function() {
     	this.$element.html(QWeb.render(this.form_template, { "widget": this }));
     },
     do_attach_tooltip: function(widget, trigger, options) {
@@ -1030,13 +1030,13 @@ openerp.web.form.WidgetFrame = openerp.web.form.Widget.extend({
         }
         this.set_row_cells_with(this.table[this.table.length - 1]);
     },
-    render_element: function() {
+    renderElement: function() {
     	this._super();
     	var self = this;
 	    _.each(this.table, function(row) {
 	        _.each(row, function(td) {
 	        	td.$element = self.$element.find('.' + td.element_class);
-	        	td.render_element();
+	        	td.renderElement();
 	        });
 	    });
     },
@@ -1140,12 +1140,12 @@ openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({
             }
         }
     },
-    render_element: function() {
+    renderElement: function() {
     	this._super();
     	var self = this;
 	    _.each(this.pages, function(page) {
         	page.$element = self.$element.find('.' + page.element_class);
-        	page.render_element();
+        	page.renderElement();
 	    });
     },
     start: function() {
@@ -1335,7 +1335,7 @@ openerp.web.form.WidgetLabel = openerp.web.form.Widget.extend({
             this.nowrap = true;
         }
     },
-    render_element: function() {
+    renderElement: function() {
     	var rendered;
         if (this['for'] && this.type !== 'label') {
             rendered = QWeb.render(this.form_template, {widget: this['for']});
@@ -2819,7 +2819,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
         }, read_function: null});
         this.initial_ids = this.options.initial_ids;
         this.created_elements = [];
-        this.render_element();
+        this.renderElement();
         openerp.web.form.dialog(this.$element, {
             close: function() {
                 self.check_exit();
@@ -3028,7 +3028,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
         this.row_id = row_id;
         this.context = context || {};
         this.options = _.defaults(options || {}, {"auto_write": true});
-        this.render_element();
+        this.renderElement();
         openerp.web.dialog(this.$element, {
             title: options.title || '',
             modal: true,
@@ -3150,10 +3150,10 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({
     start: function() {
         this._super();
         this.selection.$element = $(".oe_form_view_reference_selection", this.$element);
-        this.selection.render_element();
+        this.selection.renderElement();
         this.selection.start();
         this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element);
-        this.m2o.render_element();
+        this.m2o.renderElement();
         this.m2o.start();
     },
     is_valid: function() {
@@ -3400,7 +3400,7 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
 });
 
 openerp.web.form.WidgetHtml = openerp.web.form.Widget.extend({
-    render_element: function () {
+    renderElement: function () {
         var $root = $('<div class="oe_form_html_view">');
         this.render_children(this, $root);
         var rendered = $root.html();
-- 
cgit v1.2.3


From 2f2c246fac6bcef23687e7623e8addc9b92a8998 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Feb 2012 14:02:35 +0100
Subject: [IMP] Improve menus. Works when client is reloaded

bzr revid: fme@openerp.com-20120229130235-bx8ptrz4xah1aqct
---
 addons/web/static/src/js/chrome.js | 28 ++++++++++++++++------------
 addons/web/static/src/js/views.js  |  3 +++
 2 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ae3a7143d9d..1589ede75c1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -674,6 +674,10 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
      * @param parent
      */
     template: 'Menu',
+    init: function() {
+        this._super.apply(this, arguments);
+        this.has_been_loaded = $.Deferred();
+    },
     do_reload: function() {
         var self = this;
         return this.rpc("/web/menu/load", {}, this.on_loaded).then(function () {
@@ -693,12 +697,13 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this }));
         // Hide second level submenus
         this.$secondary_menus.find('.oe_menu_toggler').siblings('.oe_secondary_submenu').hide();
+        this.has_been_loaded.resolve();
     },
     /**
      * Opens a given menu by id, as if a user had browsed to that menu by hand
      * except does not trigger any event on the way
      *
-     * @param {Number} menu_id database id of the terminal menu to select
+     * @param {Number} id database id of the terminal menu to select
      */
     open_menu: function (id) {
         var $clicked_menu, $sub_menu, $main_menu;
@@ -731,6 +736,12 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
             }
         }
     },
+    open_action: function (id) {
+        var menu_id, $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id=' + id + ']');
+        if (menu_id = $menu.data('menu')) {
+            this.open_menu(menu_id);
+        }
+    },
     on_menu_click: function(ev, id) {
         id = id || 0;
         var $clicked_menu, manual = false;
@@ -751,7 +762,10 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
             this.open_menu(id);
             this.current_menu = id;
             this.session.active_id = id;
-            this.rpc('/web/menu/action', {'menu_id': id}, this.on_menu_action_loaded);
+            var action_id = $clicked_menu.data('action-id');
+            if (action_id) {
+                this.on_action(action_id);
+            }
         }
         if (ev) {
             ev.stopPropagation();
@@ -766,16 +780,6 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         }
         $sub_menu.show();
     },
-    on_menu_action_loaded: function(data) {
-        var self = this;
-        if (data.action.length) {
-            var action = data.action[0][2];
-            action.from_menu = true;
-            self.on_action(action);
-        } else {
-            self.on_action({type: 'null_action'});
-        }
-    },
     on_action: function(action) {
     }
 });
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 08886ddfbe3..82f6d63b9f1 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -65,6 +65,9 @@ session.web.ActionManager = session.web.OldWidget.extend({
             if (run_action) {
                 this.null_action();
                 action_loaded = this.do_action(state.action_id);
+                session.webclient.menu.has_been_loaded.then(function() {
+                    session.webclient.menu.open_action(state.action_id);
+                });
             }
         } else if (state.model && state.id) {
             // TODO handle context & domain ?
-- 
cgit v1.2.3


From aacfe84d5d9aade37c48157bdc81100ae3595965 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 29 Feb 2012 14:18:26 +0100
Subject: [fix] small problem in client actions

bzr revid: nicolas.vanhoren@openerp.com-20120229131826-uofegm4lmsn83r06
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 82f6d63b9f1..503ec360013 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -183,7 +183,7 @@ session.web.ActionManager = session.web.OldWidget.extend({
         this.content_stop();
         this.dialog_stop();
         var ClientWidget = session.web.client_actions.get_object(action.tag);
-        (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
+        (this.client_widget = new ClientWidget(this, action.params)).appendTo(this.$element);
     },
     ir_actions_report_xml: function(action, on_closed) {
         var self = this;
-- 
cgit v1.2.3


From c7809cafe795e2e29f5e1605691028f2c0159860 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Feb 2012 15:15:27 +0100
Subject: [IMP] Renamed DropDownMenu to UserMenu

bzr revid: fme@openerp.com-20120229141527-tuhkt0isveefy2kp
---
 addons/web/static/src/js/chrome.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1589ede75c1..4b958f5caf0 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -784,10 +784,10 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     }
 });
 
-openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.DropDownMenu# */{
-    template: "DropDownMenu",
+openerp.web.UserMenu =  openerp.web.Widget.extend(/** @lends openerp.web.UserMenu# */{
+    template: "UserMenu",
     /**
-     * @constructs openerp.web.DropDownMenu
+     * @constructs openerp.web.UserMenu
      * @extends openerp.web.Widget
      *
      * @param parent
@@ -876,7 +876,7 @@ openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.Dro
             $(sc.binding).bind({
                 'add': function (e, attrs) {
                     shortcuts_ds.create(attrs, function (out) {
-                        var shortcut = QWeb.render('DropDownMenu.shortcut', {
+                        var shortcut = QWeb.render('UserMenu.shortcut', {
                             shortcuts : [{
                                 name : attrs.name,
                                 id : out.result,
@@ -904,7 +904,7 @@ openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.Dro
             sc.splice(0, sc.length);
             sc.push.apply(sc, shortcuts);
 
-            $(QWeb.render('DropDownMenu.shortcut', {'shortcuts': shortcuts}))
+            $(QWeb.render('UserMenu.shortcut', {'shortcuts': shortcuts}))
                 .appendTo(self.$element.find('.oe_dropdown_options'));
         });
     },
@@ -1004,7 +1004,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.session.on_session_valid.add(function() {
             self.show_application();
 
-            self.dropdown_menu.do_update();
+            self.user_menu.do_update();
             self.menu.do_reload();
             if(self.action_manager)
                 self.action_manager.destroy();
@@ -1034,10 +1034,10 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         self.menu = new openerp.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on_action.add(this.proxy('on_menu_action'));
-        self.dropdown_menu = new openerp.web.DropDownMenu(self);
-        self.dropdown_menu.replace(this.$element.find('.oe_dropdown_menu_placeholder'));
-        self.dropdown_menu.on_menu_logout.add(this.proxy('on_logout'));
-        self.dropdown_menu.on_action.add(this.proxy('on_menu_action'));
+        self.user_menu = new openerp.web.UserMenu(self);
+        self.user_menu.replace(this.$element.find('.oe_user_menu_placeholder'));
+        self.user_menu.on_menu_logout.add(this.proxy('on_logout'));
+        self.user_menu.on_action.add(this.proxy('on_menu_action'));
     },
     show_common: function() {
         var self = this;
-- 
cgit v1.2.3


From f32e1dacbb8fb2c927d39cce7533239b4a938d19 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 29 Feb 2012 17:22:47 +0100
Subject: [ADD] Add menuClicked event to Menu

bzr revid: fme@openerp.com-20120229162247-m765betv577y4a2i
---
 addons/web/static/src/js/chrome.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4b958f5caf0..58820efd15c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -758,6 +758,8 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
             id = $clicked_menu.data('menu');
         }
 
+        this.trigger('menuClicked', id, $clicked_menu);
+
         if (id) {
             this.open_menu(id);
             this.current_menu = id;
-- 
cgit v1.2.3


From bedb2d9596010f226c81c65b831795d7e1536acc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 1 Mar 2012 10:58:07 +0100
Subject: [IMP] Added Systray tooltips

bzr revid: fme@openerp.com-20120301095807-w8xi6b36adf1ky1z
---
 addons/web/static/src/js/chrome.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 58820efd15c..3b0e30382aa 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1019,6 +1019,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
                 document.title = version_label;
             }
         });
+        this.$element.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() {
+            $(this).attr('data-tipsy', 'true').tipsy().trigger('mouseenter');
+        });
     },
     show_login: function() {
         var self = this;
-- 
cgit v1.2.3


From 7e5feece185205a187d57539d97d5b0279cf4c68 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Mar 2012 14:00:08 +0100
Subject: [ADD] eval tests for eval_domain_and_context

bzr revid: xmo@openerp.com-20120301130008-dijd6r49js1227by
---
 addons/web/static/src/js/core.js | 105 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index fe2ca1beb4f..679b193e121 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -321,6 +321,108 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.active_id = null;
         return this.session_init();
     },
+    test_eval: function (source, expected) {
+        try {
+            var ctx = this.test_eval_contexts(source.contexts);
+            if (!_.isEqual(ctx, expected.context)) {
+                console.group('Local context does not match remote');
+                console.warn('source', source.contexts);
+                console.warn('local', ctx);
+                console.warn('remote', expected.context);
+                console.groupEnd();
+            }
+        } catch (e) {
+            console.error(
+                'Failed to evaluate contexts', source.contexts, ':', e);
+        }
+
+        try {
+            var dom = this.test_eval_domains(source.domains);
+            if (!_.isEqual(dom, expected.domain)) {
+                console.group('Local domain does not match remote');
+                console.warn('source', source.domains);
+                console.warn('local', dom);
+                console.warn('remote', expected.domain);
+                console.groupEnd();
+            }
+        } catch (e) {
+            console.error(
+                'Failed to evaluate domains', source.domains, ':', e);
+        }
+
+        try {
+            var groups = this.test_eval_groupby(source.group_by_seq);
+            if (!_.isEqual(groups, expected.group_by)) {
+                console.group('Local groupby does not match remote');
+                console.warn('source', source.group_by_seq);
+                console.warn('local', groups);
+                console.warn('remote', expected.group_by);
+                console.groupEnd();
+            }
+        } catch (e) {}
+    },
+    test_eval_contexts: function (contexts) {
+        var result_context = _.extend({}, this.user_context),
+            self = this;
+        _(contexts).each(function (ctx) {
+            switch(ctx.__ref) {
+            case 'context':
+                _.extend(py.eval(ctx.__debug));
+                break;
+            case 'compound_context':
+                _.extend(self.test_eval_contexts(ctx.__contexts));
+                break;
+            default:
+                _.extend(result_context, ctx);
+            }
+        });
+        return result_context;
+    },
+    test_eval_domains: function (domains) {
+        var result_domain = [], self = this;
+        _(domains).each(function (dom) {
+            switch(dom.__ref) {
+            case 'domain':
+                result_domain.push.apply(
+                    result_domain, py.eval(dom.__debug));
+                break;
+            case 'compound_domain':
+                result_domain.push.apply(
+                    result_domain, self.test_eval_contexts(dom.__contexts));
+                break;
+            default:
+                result_domain.push.apply(
+                    result_domain, dom);
+            }
+        });
+        return result_domain;
+    },
+    test_eval_groupby: function (contexts) {
+        var result_group = [], self = this;
+        _(contexts).each(function (ctx) {
+            var group;
+            switch(ctx.__ref) {
+            case 'context':
+                group = py.eval(ctx.__debug).group_by;
+                break;
+            case 'compound_context':
+                group = self.test_eval_contexts(ctx.__contexts).group_by;
+                break;
+            default:
+                group = ctx.group_by
+            }
+            if (!group) { return; }
+            if (typeof group === 'string') {
+                result_group.push(group);
+            } else if (group instanceof Array) {
+                result_group.push.apply(result_group, group);
+            } else {
+                throw new Error('Got invalid groupby {{'
+                        + JSON.stringify(group) + '}}');
+            }
+        });
+        return result_group;
+    },
     /**
      * Executes an RPC call, registering the provided callbacks.
      *
@@ -358,6 +460,9 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             function (response, textStatus, jqXHR) {
                 self.on_rpc_response();
                 if (!response.error) {
+                    if (url.url === '/web/session/eval_domain_and_context') {
+                        self.test_eval(params, response.result);
+                    }
                     deferred.resolve(response["result"], textStatus, jqXHR);
                 } else if (response.error.data.type === "session_invalid") {
                     self.uid = false;
-- 
cgit v1.2.3


From 12358af73bc0df054881258d690c91536e92b368 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Mar 2012 14:59:00 +0100
Subject: [IMP] add basic evaluation context to asserter (for domains, so time
 and datetime are available).

Doesn't really work because kwargs not supported by py.js (see bug #3), so Sales > Reporting > Opportunities analysis does not work

Also current implementation of datetime and time.strftime very incomplete

bzr revid: xmo@openerp.com-20120301135900-w4aucd5boi9yzmod
---
 addons/web/static/src/js/core.js | 50 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 679b193e121..ca53bce9c59 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -321,6 +321,47 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.active_id = null;
         return this.session_init();
     },
+    test_eval_get_context: function () {
+        var datetime = new py.object();
+        var date = datetime.date = new py.type(function date(y, m, d) {
+            this._year = y;
+            this._month = m;
+            this._day = d;
+        }, py.object, {
+            strftime: function (format) {
+                var f = format.toJSON(), self = this;
+                return new py.str(f.replace(/%([A-Za-z])/g, function (m, c) {
+                    switch (c) {
+                    case 'Y': return self._year;
+                    case 'm': return _.str.sprintf('%02d', self._month);
+                    case 'd': return _.str.sprintf('%02d', self._day);
+                    }
+                    throw new Error('ValueError: No known conversion for ' + m);
+                }));
+            }
+        });
+        date.__getattribute__ = function (name) {
+            if (name === 'today') {
+                return date.today;
+            }
+            throw new Error("AttributeError: object 'date' has no attribute '" + name +"'");
+        };
+        date.today = new py.def(function () {
+            var d = new Date();
+            return new date(d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate());
+        });
+
+        var time = new py.object();
+        time.strftime = new py.def(function (format) {
+            return date.today.__call__().strftime(format);
+        });
+
+        return {
+            uid: new py.float(this.uid),
+            datetime: datetime,
+            time: time
+        };
+    },
     test_eval: function (source, expected) {
         try {
             var ctx = this.test_eval_contexts(source.contexts);
@@ -337,7 +378,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         }
 
         try {
-            var dom = this.test_eval_domains(source.domains);
+            var dom = this.test_eval_domains(source.domains, this.test_eval_get_context());
             if (!_.isEqual(dom, expected.domain)) {
                 console.group('Local domain does not match remote');
                 console.warn('source', source.domains);
@@ -378,17 +419,18 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         });
         return result_context;
     },
-    test_eval_domains: function (domains) {
+    test_eval_domains: function (domains, eval_context) {
         var result_domain = [], self = this;
         _(domains).each(function (dom) {
             switch(dom.__ref) {
             case 'domain':
                 result_domain.push.apply(
-                    result_domain, py.eval(dom.__debug));
+                    result_domain, py.eval(dom.__debug, eval_context));
                 break;
             case 'compound_domain':
                 result_domain.push.apply(
-                    result_domain, self.test_eval_contexts(dom.__contexts));
+                    result_domain, self.test_eval_domains(
+                            dom.__domains, eval_context));
                 break;
             default:
                 result_domain.push.apply(
-- 
cgit v1.2.3


From f8a93bc2848eba516213142f4f730a1feda5a39e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 5 Mar 2012 09:55:32 +0100
Subject: [FIX] update py.js for operators &al, implement basic crummy version
 of relativedelta

bzr revid: xmo@openerp.com-20120305085532-0vcz6j0m985gjuz1
---
 addons/web/static/src/js/core.js | 128 +++++++++++++++++++++++++++++++++++----
 1 file changed, 117 insertions(+), 11 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index ca53bce9c59..ead33822926 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -322,19 +322,34 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         return this.session_init();
     },
     test_eval_get_context: function () {
+        var asJS = function (arg) {
+            if (arg instanceof py.object) {
+                return arg.toJSON();
+            }
+            return arg;
+        };
+
         var datetime = new py.object();
+        datetime.datetime = new py.type(function datetime() {
+            throw new Error('datetime.datetime not implemented');
+        });
         var date = datetime.date = new py.type(function date(y, m, d) {
-            this._year = y;
-            this._month = m;
-            this._day = d;
+            if (y instanceof Array) {
+                d = y[2];
+                m = y[1];
+                y = y[0];
+            }
+            this.year = asJS(y);
+            this.month = asJS(m);
+            this.day = asJS(d);
         }, py.object, {
-            strftime: function (format) {
-                var f = format.toJSON(), self = this;
+            strftime: function (args) {
+                var f = asJS(args[0]), self = this;
                 return new py.str(f.replace(/%([A-Za-z])/g, function (m, c) {
                     switch (c) {
-                    case 'Y': return self._year;
-                    case 'm': return _.str.sprintf('%02d', self._month);
-                    case 'd': return _.str.sprintf('%02d', self._day);
+                    case 'Y': return self.year;
+                    case 'm': return _.str.sprintf('%02d', self.month);
+                    case 'd': return _.str.sprintf('%02d', self.day);
                     }
                     throw new Error('ValueError: No known conversion for ' + m);
                 }));
@@ -350,16 +365,107 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             var d = new Date();
             return new date(d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate());
         });
+        datetime.time = new py.type(function time() {
+            throw new Error('datetime.time not implemented');
+        });
 
         var time = new py.object();
-        time.strftime = new py.def(function (format) {
-            return date.today.__call__().strftime(format);
+        time.strftime = new py.def(function (args) {
+            return date.today.__call__().strftime(args);
+        });
+
+        var relativedelta = new py.type(function relativedelta(args, kwargs) {
+            if (!_.isEmpty(args)) {
+                throw new Error('Extraction of relative deltas from existing datetimes not supported');
+            }
+            this.ops = kwargs;
+        }, py.object, {
+            __add__: function (other) {
+                if (!(other instanceof datetime.date)) {
+                    return py.NotImplemented;
+                }
+                // TODO: test this whole mess
+                var year = asJS(this.ops.year) || asJS(other.year);
+                if (asJS(this.ops.years)) {
+                    year += asJS(this.ops.years);
+                }
+
+                var month = asJS(this.ops.month) || asJS(other.month);
+                if (asJS(this.ops.months)) {
+                    month += asJS(this.ops.months);
+                    // FIXME: no divmod in JS?
+                    while (month < 1) {
+                        year -= 1;
+                        month += 12;
+                    }
+                    while (month > 12) {
+                        year += 1;
+                        month -= 12;
+                    }
+                }
+
+                var lastMonthDay = new Date(year, month, 0).getDate();
+                var day = asJS(this.ops.day) || asJS(other.day);
+                if (day > lastMonthDay) { day = lastMonthDay; }
+                var days_offset = ((asJS(this.ops.weeks) || 0) * 7) + (asJS(this.ops.days) || 0);
+                if (days_offset) {
+                    day = new Date(year, month-1, day + days_offset).getDate();
+                }
+                // TODO: leapdays?
+                // TODO: hours, minutes, seconds? Not used in XML domains
+                // TODO: weekday?
+                return new datetime.date(year, month, day);
+            },
+            __radd__: function (other) {
+                return this.__add__(other);
+            },
+
+            __sub__: function (other) {
+                if (!(other instanceof datetime.date)) {
+                    return py.NotImplemented;
+                }
+                // TODO: test this whole mess
+                var year = asJS(this.ops.year) || asJS(other.year);
+                if (asJS(this.ops.years)) {
+                    year -= asJS(this.ops.years);
+                }
+
+                var month = asJS(this.ops.month) || asJS(other.month);
+                if (asJS(this.ops.months)) {
+                    month -= asJS(this.ops.months);
+                    // FIXME: no divmod in JS?
+                    while (month < 1) {
+                        year -= 1;
+                        month += 12;
+                    }
+                    while (month > 12) {
+                        year += 1;
+                        month -= 12;
+                    }
+                }
+
+                var lastMonthDay = new Date(year, month, 0).getDate();
+                var day = asJS(this.ops.day) || asJS(other.day);
+                if (day > lastMonthDay) { day = lastMonthDay; }
+                var days_offset = ((asJS(this.ops.weeks) || 0) * 7) + (asJS(this.ops.days) || 0);
+                if (days_offset) {
+                    day = new Date(year, month-1, day - days_offset).getDate();
+                }
+                // TODO: leapdays?
+                // TODO: hours, minutes, seconds? Not used in XML domains
+                // TODO: weekday?
+                return new datetime.date(year, month, day);
+            },
+            __rsub__: function (other) {
+                return this.__sub__(other);
+            }
         });
 
         return {
             uid: new py.float(this.uid),
             datetime: datetime,
-            time: time
+            time: time,
+            relativedelta: relativedelta
         };
     },
     test_eval: function (source, expected) {
-- 
cgit v1.2.3


From 0e177c250596bec870bc65e180832be04b48ad3e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 5 Mar 2012 16:10:17 +0100
Subject: [FIX] content display of URI fields when no value is provided

lp bug: https://launchpad.net/bugs/942958 fixed

bzr revid: xmo@openerp.com-20120305151017-k98vlcq72hldwnev
---
 addons/web/static/src/js/view_page.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index 3b436841579..ceddf3cc5ee 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -96,6 +96,10 @@ openerp.web.page = function (openerp) {
             return value;
         },
         set_value: function (value) {
+            if (!value) {
+                this.$element.find('a').text('').attr('href', '#');
+                return;
+            }
             this.$element.find('a')
                     .attr('href', this.scheme + ':' + value)
                     .text(this.format_value(value));
@@ -106,6 +110,10 @@ openerp.web.page = function (openerp) {
     });
     openerp.web.page.FieldUrlReadonly = openerp.web.page.FieldURIReadonly.extend({
         set_value: function (value) {
+            if (!value) {
+                this.$element.find('a').text('').attr('href', '#');
+                return;
+            }
             var s = /(\w+):(.+)/.exec(value);
             if (!s) {
                 value = "http://" + value;
-- 
cgit v1.2.3


From 28f1ded961c2b2f598a1b0a2a55f5bccb2eeafc7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Mar 2012 18:16:56 +0100
Subject: [FIX] @default_focus not honored in embedded form views

lp bug: https://launchpad.net/bugs/944080 fixed

bzr revid: fme@openerp.com-20120305171656-yz1jjoin17hh8ast
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6a45bae5abd..6ae693dcd2e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -205,7 +205,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             if (self.sidebar) {
                 self.sidebar.attachments.do_update();
             }
-            if (self.default_focus_field && !self.embedded_view) {
+            if (self.default_focus_field) {
                 self.default_focus_field.focus();
             }
             if (record.id) {
-- 
cgit v1.2.3


From eb2338c575a47d721ba018cca349ff76aadee038 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Mar 2012 18:20:21 +0100
Subject: [FIX] @default_focus not honored in embedded form views

lp bug: https://launchpad.net/bugs/944080 fixed

bzr revid: fme@openerp.com-20120305172021-wwmen156hb38yppc
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 70b66b897eb..d4a090eafcc 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -211,7 +211,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             if (self.sidebar) {
                 self.sidebar.attachments.do_update();
             }
-            if (self.default_focus_field && !self.embedded_view) {
+            if (self.default_focus_field) {
                 self.default_focus_field.focus();
             }
             if (record.id) {
-- 
cgit v1.2.3


From 542948ee6af7cf02e2e0df8ff5c320057179f66a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Mar 2012 18:34:19 +0100
Subject: [FIX] List view "Group" label should be translatable

lp bug: https://launchpad.net/bugs/943973 fixed

bzr revid: fme@openerp.com-20120305173419-ksme8ckweu98b82r
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index c44b62d08f2..aa4d3963db1 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -363,7 +363,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                 _(this.fields_view.arch.children).map(field_to_column));
         if (grouped) {
             this.columns.unshift({
-                id: '_group', tag: '', string: "Group", meta: true,
+                id: '_group', tag: '', string: _t("Group"), meta: true,
                 modifiers_for: function () { return {}; }
             }, {
                 id: '_count', tag: '', string: '#', meta: true,
-- 
cgit v1.2.3


From effd8e2ca3a053a258831d5ac53676d00ee948e8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Mar 2012 19:45:16 +0100
Subject: [FIX] "Group" label in list view should be translatable

lp bug: https://launchpad.net/bugs/943973 fixed

bzr revid: fme@openerp.com-20120305184516-6j7ftdnflw6mrb0p
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 30a0018b6e1..e8fff450c6e 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -363,7 +363,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                 _(this.fields_view.arch.children).map(field_to_column));
         if (grouped) {
             this.columns.unshift({
-                id: '_group', tag: '', string: "Group", meta: true,
+                id: '_group', tag: '', string: _t("Group"), meta: true,
                 modifiers_for: function () { return {}; }
             }, {
                 id: '_count', tag: '', string: '#', meta: true,
-- 
cgit v1.2.3


From 542a6e9a671c59f73b93c022d0072fdba4dbe6b5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Mar 2012 20:58:00 +0100
Subject: [FIX] @digits not honored by form view. field#digits not honored by
 page view.

lp bug: https://launchpad.net/bugs/943273 fixed

bzr revid: fme@openerp.com-20120305195800-uoiu74ee1rfm4tex
---
 addons/web/static/src/js/view_form.js |  7 +------
 addons/web/static/src/js/view_page.js | 12 +++++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6ae693dcd2e..335a4e39d72 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1526,16 +1526,11 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
     init: function (view, node) {
         this._super(view, node);
         if (node.attrs.digits) {
-            this.parse_digits(node.attrs.digits);
+            this.digits = py.eval(node.attrs.digits).toJSON();
         } else {
             this.digits = view.fields_view.fields[node.attrs.name].digits;
         }
     },
-    parse_digits: function (digits_attr) {
-        // could use a Python parser instead.
-        var match = /^\s*[\(\[](\d+),\s*(\d+)/.exec(digits_attr);
-        return [parseInt(match[1], 10), parseInt(match[2], 10)];
-    },
     set_value: function(value) {
         if (value === false || value === undefined) {
             // As in GTK client, floats default to 0
diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index ceddf3cc5ee..b34fd0e358b 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -89,6 +89,16 @@ openerp.web.page = function (openerp) {
             return show_value;
         }
     });
+    openerp.web.page.FieldFloatReadonly = openerp.web.page.FieldCharReadonly.extend({
+        init: function (view, node) {
+            this._super(view, node);
+            if (node.attrs.digits) {
+                this.digits = py.eval(node.attrs.digits).toJSON();
+            } else {
+                this.digits = view.fields_view.fields[node.attrs.name].digits;
+            }
+        }
+    });
     openerp.web.page.FieldURIReadonly = openerp.web.page.FieldCharReadonly.extend({
         template: 'FieldURI.readonly',
         scheme: null,
@@ -269,7 +279,7 @@ openerp.web.page = function (openerp) {
         'one2many_list' : 'openerp.web.page.FieldOne2ManyReadonly',
         'reference': 'openerp.web.page.FieldReferenceReadonly',
         'boolean': 'openerp.web.page.FieldBooleanReadonly',
-        'float': 'openerp.web.page.FieldCharReadonly',
+        'float': 'openerp.web.page.FieldFloatReadonly',
         'integer': 'openerp.web.page.FieldCharReadonly',
         'float_time': 'openerp.web.page.FieldCharReadonly',
         'binary': 'openerp.web.page.FieldBinaryFileReadonly',
-- 
cgit v1.2.3


From 43ab27d7bb6c06f06a19917af24d567716a946ed Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 6 Mar 2012 12:02:12 +0100
Subject: [FIX] Menu not working anymore after the installation of a module

lp bug: https://launchpad.net/bugs/944113 fixed

bzr revid: fme@openerp.com-20120306110212-9qd1r0q5t0zwnnt0
---
 addons/web/static/src/js/chrome.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1d465df1cc5..20750f07a4e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -678,6 +678,11 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         this._super.apply(this, arguments);
         this.has_been_loaded = $.Deferred();
     },
+    start: function() {
+        this._super.apply(this, arguments);
+        this.$secondary_menus = this.getParent().$element.find('.oe_secondary_menus_container');
+        this.$secondary_menus.on('click', 'a[data-menu]', this.on_menu_click);
+    },
     do_reload: function() {
         var self = this;
         return this.rpc("/web/menu/load", {}, this.on_loaded).then(function () {
@@ -689,11 +694,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
     on_loaded: function(data) {
         this.data = data;
         this.renderElement();
-        if (!this.$secondary_menus && this.getParent()) {
-            // TODO: create Widget openerp.web.SubMenu
-            this.$secondary_menus = this.getParent().$element.find('.oe_secondary_menus_container');
-            this.$element.add(this.$secondary_menus).on('click', 'a[data-menu]', this.on_menu_click);
-        }
+        this.$element.on('click', 'a[data-menu]', this.on_menu_click);
         this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this }));
         // Hide second level submenus
         this.$secondary_menus.find('.oe_menu_toggler').siblings('.oe_secondary_submenu').hide();
-- 
cgit v1.2.3


From 34b03bd24d8db9dcd36477b7e1076ae9b180870b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 6 Mar 2012 21:59:55 +0100
Subject: [FIX] Can't add to dashboard a view that includes a 'group_by'

lp bug: https://launchpad.net/bugs/948097 fixed

bzr revid: fme@openerp.com-20120306205955-zqgtbgtz1gtix4w9
---
 addons/web/static/src/js/views.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 56997190bc1..a9979ebf099 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -408,6 +408,9 @@ session.web.ViewManager =  session.web.OldWidget.extend(/** @lends session.web.V
             var groupby = results.group_by.length
                         ? results.group_by
                         : action_context.group_by;
+            if (_.isString(groupby)) {
+                groupby = [groupby];
+            }
             controller.do_search(results.domain, results.context, groupby || []);
         });
     },
-- 
cgit v1.2.3


From 98341230a78fe9798b55d3a4173b17a00d8d9a0f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Mar 2012 08:46:41 +0100
Subject: [FIX] context evaluation: accumulation of literal and compound
 context data into evaluated context

bzr revid: xmo@openerp.com-20120307074641-pm5wl9t3cb4l9s64
---
 addons/web/static/src/js/core.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 6e44394c8a2..6f9773a676e 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -514,10 +514,11 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         _(contexts).each(function (ctx) {
             switch(ctx.__ref) {
             case 'context':
-                _.extend(py.eval(ctx.__debug));
+                _.extend(result_context, py.eval(ctx.__debug));
                 break;
             case 'compound_context':
-                _.extend(self.test_eval_contexts(ctx.__contexts));
+                _.extend(
+                    result_context, self.test_eval_contexts(ctx.__contexts));
                 break;
             default:
                 _.extend(result_context, ctx);
-- 
cgit v1.2.3


From cdd72c0fe65616d7bdf7a376cb29ed11bd2420d7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Mar 2012 10:57:00 +0100
Subject: [FIX] Make progress bar (format.js) more tolerant with falsy floats

bzr revid: fme@openerp.com-20120307095700-i5msqipgij4v36fl
---
 addons/web/static/src/js/formats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 90d95f70ec5..c29df56bb30 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -336,7 +336,7 @@ openerp.web.format_cell = function (row_data, column, options) {
     case 'progressbar':
         return _.template(
             '<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
-                value: _.str.sprintf("%.0f", row_data[column.id].value)
+                value: _.str.sprintf("%.0f", row_data[column.id].value || 0)
             });
     }
 
-- 
cgit v1.2.3


From 80ebf90a7c411342cc280cb2824f117fad15bb55 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Mar 2012 10:57:32 +0100
Subject: [IMP] debug messages of test evaluator

bzr revid: xmo@openerp.com-20120307095732-ckfuowa43i7dkapg
---
 addons/web/static/src/js/core.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 6f9773a676e..f464bded13b 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -468,45 +468,57 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             relativedelta: relativedelta
         };
     },
+    /**
+     * FIXME: Huge testing hack, especially the evaluation context, rewrite + test for real before switching
+     */
     test_eval: function (source, expected) {
         try {
             var ctx = this.test_eval_contexts(source.contexts);
             if (!_.isEqual(ctx, expected.context)) {
-                console.group('Local context does not match remote');
+                console.group('Local context does not match remote, nothing is broken but please report to R&D (xmo)');
                 console.warn('source', source.contexts);
                 console.warn('local', ctx);
                 console.warn('remote', expected.context);
                 console.groupEnd();
             }
         } catch (e) {
-            console.error(
-                'Failed to evaluate contexts', source.contexts, ':', e);
+            console.group('Failed to evaluate contexts, nothing is broken but please report to R&D (xmo)');
+            console.error(e);
+            console.log('source', source.contexts);
+            console.groupEnd();
         }
 
         try {
             var dom = this.test_eval_domains(source.domains, this.test_eval_get_context());
             if (!_.isEqual(dom, expected.domain)) {
-                console.group('Local domain does not match remote');
+                console.group('Local domain does not match remote, nothing is broken but please report to R&D (xmo)');
                 console.warn('source', source.domains);
                 console.warn('local', dom);
                 console.warn('remote', expected.domain);
                 console.groupEnd();
             }
         } catch (e) {
-            console.error(
-                'Failed to evaluate domains', source.domains, ':', e);
+            console.group('Failed to evaluate domains, nothing is broken but please report to R&D (xmo)');
+            console.error(e);
+            console.log('source', source.domains);
+            console.groupEnd();
         }
 
         try {
             var groups = this.test_eval_groupby(source.group_by_seq);
             if (!_.isEqual(groups, expected.group_by)) {
-                console.group('Local groupby does not match remote');
+                console.group('Local groupby does not match remote, nothing is broken but please report to R&D (xmo)');
                 console.warn('source', source.group_by_seq);
                 console.warn('local', groups);
                 console.warn('remote', expected.group_by);
                 console.groupEnd();
             }
-        } catch (e) {}
+        } catch (e) {
+            console.group('Failed to evaluate groupby, nothing is broken but please report to R&D (xmo)');
+            console.error(e);
+            console.log('source', source.group_by_seq);
+            console.groupEnd();
+        }
     },
     test_eval_contexts: function (contexts) {
         var result_context = _.extend({}, this.user_context),
-- 
cgit v1.2.3


From 0df6b1bad7f4d12495a5c95cdbf7e3491e452a96 Mon Sep 17 00:00:00 2001
From: msh-openerp <msh@tinyerp.com>
Date: Wed, 7 Mar 2012 15:49:35 +0530
Subject: [FIX]Fixed the issue of statusbar which shows technical name in
 listview if one gives widget=statusbar in listview field.

bzr revid: msh@tinyerp.com-20120307101935-mw4vyjjra6e9uy1v
---
 addons/web/static/src/js/formats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 90d95f70ec5..7a3b1db1614 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -148,7 +148,7 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
             if (typeof(value) == "string")
                 value = openerp.web.auto_str_to_date(value);
             return value.toString(normalize_format(l10n.time_format));
-        case 'selection':
+        case 'selection': case 'statusbar':
             // Each choice is [value, label]
             if(_.isArray(value)) {
                  value = value[0]
-- 
cgit v1.2.3


From bfb9896ddd49e29eb43a80ab0b668beef4536e32 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 7 Mar 2012 11:46:32 +0100
Subject: [FIX] database/create replaced by blocking database/create_database
 (so we can use a multi-workers OpenERP server; otherwise polling on the
 server would hit different workers resulting in errors).

bzr revid: vmt@openerp.com-20120307104632-w6cs6nxf04ltcpf1
---
 addons/web/static/src/js/chrome.js | 51 ++++++--------------------------------
 1 file changed, 8 insertions(+), 43 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 132cc3b5851..4115bd12fea 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -344,44 +344,6 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
         });
         return result;
     },
-    /**
-     * Waits until the new database is done creating, then unblocks the UI and
-     * logs the user in as admin
-     *
-     * @param {Number} db_creation_id identifier for the db-creation operation, used to fetch the current installation progress
-     * @param {Object} info info fields for this database creation
-     * @param {String} info.db name of the database being created
-     * @param {String} info.password super-admin password for the database
-     */
-    wait_for_newdb: function (db_creation_id, info) {
-        var self = this;
-        self.rpc('/web/database/progress', {
-            id: db_creation_id,
-            password: info.password
-        }, function (result) {
-            var progress = result[0];
-            // I'd display a progress bar, but turns out the progress status
-            // the server report kind-of blows goats: it's at 0 for ~75% of
-            // the installation, then jumps to 75%, then jumps down to either
-            // 0 or ~40%, then back up to 75%, then terminates. Let's keep that
-            // mess hidden behind a not-very-useful but not overly weird
-            // message instead.
-            if (progress < 1) {
-                setTimeout(function () {
-                    self.wait_for_newdb(db_creation_id, info);
-                }, 500);
-                return;
-            }
-
-            var admin = result[1][0];
-            setTimeout(function () {
-                self.widget_parent.do_login(
-                        info.db, admin.login, admin.password);
-                self.stop();
-                self.unblockUI();
-            });
-        });
-    },
     /**
      * Blocks UI and replaces $.unblockUI by a noop to prevent third parties
      * from unblocking the UI
@@ -422,7 +384,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
             submitHandler: function (form) {
                 var fields = $(form).serializeArray();
                 self.blockUI();
-                self.rpc("/web/database/create", {'fields': fields}, function(result) {
+                self.rpc("/web/database/create_database", {'fields': fields}, function(result) {
                     if (result.error) {
                         self.unblockUI();
                         self.display_error(result);
@@ -433,11 +395,14 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
                         self.db_list.sort();
                         self.widget_parent.set_db_list(self.db_list);
                     }
+
                     var form_obj = self.to_object(fields);
-                    self.wait_for_newdb(result, {
-                        password: form_obj['super_admin_pwd'],
-                        db: form_obj['db_name']
-                    });
+                    self.widget_parent.do_login(
+                            form_obj['db_name'],
+                            'admin',
+                            form_obj['create_admin_pwd']);
+                    self.stop();
+                    self.unblockUI();
                 });
             }
         });
-- 
cgit v1.2.3


From 9a646fce10f3a918fce7766d672024019255c1ed Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Mar 2012 13:03:23 +0100
Subject: [ADD] permanent loading of saved filters

When selecting a saved filter, its data is now saved inside the
searchview's state, and re-used any time there's a search performed
(until the filter is replaced or the search view is cleared).

Some cleanup of the support code for loading filters
(SearchView.get_filters) also had to be performed in order not to fill
contexts with (potentially incorrect) crap in case the filter is
re-saved.

lp bug: https://launchpad.net/bugs/948219 fixed

bzr revid: xmo@openerp.com-20120307120323-pub0yuwjqk1r3y0p
---
 addons/web/static/src/js/search.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2809b3792de..8ffb0bdb7c4 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -32,6 +32,8 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
         this.hidden = !!hidden;
         this.headless = this.hidden && !this.has_defaults;
 
+        this.filter_data = {};
+
         this.ready = $.Deferred();
     },
     start: function() {
@@ -271,7 +273,12 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
                         group_by instanceof Array ? group_by : group_by.split(','),
                         function (el) { return { group_by: el }; });
                 }
-                this.on_search([filter.domain], [filter.context], groupbys);
+                this.filter_data = {
+                    domains: [filter.domain],
+                    contexts: [filter.context],
+                    groupbys: groupbys
+                };
+                this.do_search();
             }, this));
         } else {
             select.val('');
@@ -339,9 +346,6 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
         if (this.headless && !this.has_defaults) {
             return this.on_search([], [], []);
         }
-        // reset filters management
-        var select = this.$element.find(".oe_search-view-filters-management");
-        select.val("_filters");
 
         if (e && e.preventDefault) { e.preventDefault(); }
 
@@ -385,6 +389,16 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
                 .map(function (filter) { return filter.get_context();})
                 .compact()
                 .value();
+
+        if (this.filter_data.contexts) {
+            contexts = this.filter_data.contexts.concat(contexts)
+        }
+        if (this.filter_data.domains) {
+            domains = this.filter_data.domains.concat(domains);
+        }
+        if (this.filter_data.groupbys) {
+            groupbys = this.filter_data.groupbys.concat(groupbys);
+        }
         return {domains: domains, contexts: contexts, errors: errors, groupbys: groupbys};
     },
     /**
@@ -423,6 +437,9 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea
      * @param {Boolean} [reload_view=true]
      */
     do_clear: function (reload_view) {
+        this.filter_data = {};
+        this.$element.find(".oe_search-view-filters-management").val('');
+
         this.$element.find('.filter_label, .filter_icon').removeClass('enabled');
         this.enabled_filters.splice(0);
         var string = $('a.searchview_group_string');
-- 
cgit v1.2.3


From 8c65ef53b93e6e1a8bdc8082b6d3706443875fc5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 7 Mar 2012 16:05:00 +0100
Subject: [imp] minor feature in the web client class to set the content to
 full screen

bzr revid: nicolas.vanhoren@openerp.com-20120307150500-o8kkxp4ohrtzjq69
---
 addons/web/static/src/js/chrome.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 20750f07a4e..cd3ff72ff6a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1127,6 +1127,12 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
                 self.menu.on_menu_click(null, action.menu_id);
             });
         }
+    },
+    set_content_full_screen: function(fullscreen) {
+        if (fullscreen)
+            this.$element.addClass("oe_content_full_screen");
+        else
+            this.$element.removeClass("oe_content_full_screen");
     }
 });
 
-- 
cgit v1.2.3


From 659ab1ff3b85c0035e8c4b23852973a0ee331888 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 7 Mar 2012 16:55:29 +0100
Subject: [imp] changed detail in full screen feature

bzr revid: nicolas.vanhoren@openerp.com-20120307155529-t83uabjx0ocm8mjq
---
 addons/web/static/src/js/chrome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index cd3ff72ff6a..829610f2988 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1130,9 +1130,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
     },
     set_content_full_screen: function(fullscreen) {
         if (fullscreen)
-            this.$element.addClass("oe_content_full_screen");
+            $(".oe_webclient", this.$element).addClass("oe_content_full_screen");
         else
-            this.$element.removeClass("oe_content_full_screen");
+            $(".oe_webclient", this.$element).removeClass("oe_content_full_screen");
     }
 });
 
-- 
cgit v1.2.3


From 66e1ce8606643eb0490584356f2d7b60cfffd3e6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 8 Mar 2012 11:21:51 +0100
Subject: [FIX] Missing date.js CultureInfo's am/pm descriptor causes wrong
 dates to be sent to server without user's knowledge

lp bug: https://launchpad.net/bugs/938497 fixed

bzr revid: fme@openerp.com-20120308102151-eyr71rzk345f6xji
---
 addons/web/static/src/js/core.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 106d2b86dc9..49840e5aba8 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -744,6 +744,14 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                         var file_list = ["/web/static/lib/datejs/globalization/" + lang.replace("_", "-") + ".js"];
                         return self.rpc('/web/webclient/jslist', {mods: to_load}).pipe(function(files) {
                             return self.do_load_js(file_list.concat(files));
+                        }).then(function () {
+                            if (!Date.CultureInfo.pmDesignator) {
+                                // If no am/pm designator is specified but the openerp
+                                // datetime format uses %i, date.js won't be able to
+                                // correctly format a date. See bug#938497.
+                                Date.CultureInfo.amDesignator = 'AM';
+                                Date.CultureInfo.pmDesignator = 'PM';
+                            }
                         });
                     }))
             }
-- 
cgit v1.2.3


From 284e19c29e3338670e95045c316cf9612ff39334 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 8 Mar 2012 15:06:36 +0100
Subject: [FIX] BinaryImage field: check if value is bin_size or not

bzr revid: fme@openerp.com-20120308140636-qk2ekrmqlqpaa7uo
---
 addons/web/static/src/js/view_form.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d4a090eafcc..4866d88dd15 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3314,10 +3314,17 @@ openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
         this.$element.find('.oe-binary').toggle(!this.readonly);
     },
     set_value: function(value) {
+        console.log(value)
         this._super.apply(this, arguments);
         this.set_image_maxwidth();
-        var url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
-            this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime());
+
+        var url;
+        if (value && value.substr(0, 10).indexOf(' ') == -1) {
+            url = 'data:image/png;base64,' + this.value;
+        } else {
+            url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
+                this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime());
+        }
         this.$image.attr('src', url);
     },
     set_image_maxwidth: function() {
-- 
cgit v1.2.3


From ec8c17161c4412bd3402d80454e78cc60d3dbb8e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 12 Mar 2012 16:37:43 +0100
Subject: [REM] Removed forgotten console.log

bzr revid: fme@openerp.com-20120312153743-i6qi3fzmondezrdh
---
 addons/web/static/src/js/view_form.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4866d88dd15..a5af970c5ef 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3314,7 +3314,6 @@ openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
         this.$element.find('.oe-binary').toggle(!this.readonly);
     },
     set_value: function(value) {
-        console.log(value)
         this._super.apply(this, arguments);
         this.set_image_maxwidth();
 
-- 
cgit v1.2.3


From 89061adc7d8b6af9632cda42ea96dbabad050807 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 13 Mar 2012 16:37:07 +0100
Subject: [imp] possible problem with debug & qweb

bzr revid: nicolas.vanhoren@openerp.com-20120313153707-zi6kdlbxz72dit7l
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index f464bded13b..a962d205c1c 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1300,7 +1300,7 @@ openerp.web._lt = function (s) {
     return {toString: function () { return openerp.web._t(s); }}
 };
 openerp.web.qweb = new QWeb2.Engine();
-openerp.web.qweb.debug = (window.location.search.indexOf('?debug') !== -1);
+openerp.web.qweb.debug = ($.deparam($.param.querystring()).debug != undefined);
 openerp.web.qweb.default_dict = {
     '_' : _,
     '_t' : openerp.web._t
-- 
cgit v1.2.3


From 4e7796cfeea94e3225fed1c9b99f4f25afe6cd6a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 13 Mar 2012 17:37:19 +0100
Subject: [imp] added some stuff to manage interfaces

bzr revid: nicolas.vanhoren@openerp.com-20120313163719-ez4n7ca4qxus0m9t
---
 addons/web/static/src/js/core.js      | 17 +++++++++++
 addons/web/static/src/js/view_form.js | 53 +++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index a962d205c1c..650939c843c 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1335,6 +1335,23 @@ openerp.web.qweb.preprocess_node = function() {
     }
 };
 
+/**
+ * A small utility function to check if a class implements correctly an interface, assuming that
+ * interface is simply specified using a dictionary containing methods and attributes with the
+ * correct type. It only performs the check when in debug mode and the only effect of an invalid
+ * check is messages in the console.
+ */
+openerp.web.check_interface = function(_class, _interface) {
+    if (! openerp.web.check_interface.debug)
+        return;
+    for (var member in _interface) {
+        if ( (typeof _class.prototype[member] != typeof _interface[member]) ) {
+            console.error("class failed to implement interface member '" + member + "'");
+        }
+    }
+}
+openerp.web.check_interface.debug = ($.deparam($.param.querystring()).debug != undefined);
+
 /** Jquery extentions */
 $.Mutex = (function() {
     function Mutex() {
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a5af970c5ef..3ecc35d677f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1359,6 +1359,58 @@ openerp.web.form.WidgetLabel = openerp.web.form.Widget.extend({
     }
 });
 
+/**
+ * Interface to be implemented by fields.
+ * 
+ * Novajs Attributes:
+ *     - ...
+ * 
+ * Novajs Events:
+ *     - ...
+ * 
+ */
+openerp.web.form.FieldInterface = {
+    /**
+     * Called by the form view to indicate the value of the field.
+     * 
+     * set_value() may return an object that can be passed to $.when() that represents the moment when
+     * the field has finished all operations necessary before the user can effectively use the widget.
+     * 
+     * Multiple calls to set_value() can occur at any time and must be handled correctly by the implementation,
+     * regardless of any asynchronous operation currently running and the status of any promise that a
+     * previous call to set_value() could have returned.
+     * 
+     * set_value() must be able, at any moment, to handle the syntax returned by the "read" method of the
+     * osv class in the OpenERP server as well as the syntax used by the set_value() (see below). It must
+     * also be able to handle any other format commonly used in the _defaults key on the models in the addons
+     * as well as any format commonly returned in a on_change. It must be able to autodetect those formats as
+     * no information is ever given to know which format is used.
+     */
+    set_value: function(value) {},
+    /**
+     * Get the current value of the widget.
+     * 
+     * Must always return a syntaxically correct value to be passed to the "write" method of the osv class in
+     * the OpenERP server, although it is not assumed to respect the constraints applied to the field.
+     * For example if the field is marqued as "required", a call to get_value() can return false.
+     * 
+     * get_value() can also be called *before* a call to set_value() and, in that case, is supposed to
+     * return a defaut value according to the type of field.
+     * 
+     * This method is always assumed to perform synchronously, it can not return a promise.
+     * 
+     * If there was no user interaction to modify the value of the field, it is always assumed that
+     * get_value() return the same semantic value than the one passed in the last call to set_value(),
+     * altough the syntax can be different. This can be the case for type of fields that have a different
+     * syntax for "read" and "write" (example: m2o: set_value([0, "Administrator"]), get_value() => 0).
+     */
+    get_value: function() {},
+};
+
+/**
+ * Abstract class for classes implementing FieldInterface. Should be renamed to AbstractField some
+ * day.
+ */
 openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.form.Field# */{
     /**
      * @constructs openerp.web.form.Field
@@ -2237,6 +2289,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
         this.$input.prop('readonly', this.readonly);
     }
 });
+openerp.web.check_interface(openerp.web.form.FieldMany2One, openerp.web.form.FieldInterface);
 
 /*
 # Values: (0, 0,  { fields })    create
-- 
cgit v1.2.3


From 6a38a66d50154d5da6062a10dfe541771c3610ef Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 Mar 2012 12:10:14 +0100
Subject: [FIX] BufferedDataSet: avoid randomizing results when there are no
 sort_fields

Array.sort is not necessarily stable, and sorting an
array with an unstable sort will cause a randomization
of the original order, which should have been preserved.

See also:
  - http://ecma262-5.com/ELS5_Section_15.htm#Section_15.4.4.11
  - http://code.google.com/p/v8/issues/detail?id=90

lp bug: https://launchpad.net/bugs/928389 fixed

bzr revid: odo@openerp.com-20120314111014-1igxhrynu5557di5
---
 addons/web/static/src/js/data.js | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 8e200951eaa..d9cfc5c4002 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -741,18 +741,25 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
                              : (v1 > v2) ? 1
                              : 0;
                     };
-            records.sort(function (a, b) {
-                return _.reduce(sort_fields, function (acc, field) {
-                    if (acc) { return acc; }
-
-                    var sign = 1;
-                    if (field[0] === '-') {
-                        sign = -1;
-                        field = field.slice(1);
-                    }
-                    return sign * compare(a[field], b[field]);
-                }, 0);
-            });
+            // Array.sort is not necessarily stable. We must be careful with this because
+            // sorting an array where all items are considered equal is a worst-case that
+            // will randomize the array with an unstable sort! Therefore we must avoid
+            // sorting if there are no sort_fields (i.e. all items are considered equal)
+            // See also: http://ecma262-5.com/ELS5_Section_15.htm#Section_15.4.4.11 
+            //           http://code.google.com/p/v8/issues/detail?id=90
+            if (sort_fields.length) {
+                records.sort(function (a, b) {
+                    return _.reduce(sort_fields, function (acc, field) {
+                        if (acc) { return acc; }
+                        var sign = 1;
+                        if (field[0] === '-') {
+                            sign = -1;
+                            field = field.slice(1);
+                        }
+                        return sign * compare(a[field], b[field]);
+                    }, 0);
+                });
+            }
             completion.resolve(records);
         };
         if(to_get.length > 0) {
-- 
cgit v1.2.3