From 8184aa0154a451d096f37f81ec0db014f8c3479a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 26 Jul 2011 17:37:47 +0200
Subject: [PATCH] [imp] improved o2m, added auto-save

bzr revid: nicolas.vanhoren@openerp.com-20110726153747-2zj63korpu6xct6e
---
 addons/base/static/src/js/data.js | 15 ++++++++--
 addons/base/static/src/js/form.js | 46 +++++++++++++++++++++++++++----
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 2e89dacceb8..385bd93d360 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -492,24 +492,33 @@ openerp.base.BufferedDataSet = openerp.base.DataSetStatic.extend({
         this.to_create.push(cached);
         this.cache.push(cached);
         var to_return =  $.Deferred().then(callback);
-        setTimeout(function() {to_return.resolve({result: cached.id});}, 0);
+        to_return.resolve({result: cached.id});
         return to_return.promise();
     },
     write: function (id, data, callback) {
         var self = this;
         var record = _.detect(this.to_create, function(x) {return x.id === id;});
         record = record || _.detect(this.to_write, function(x) {return x.id === id;});
+        var dirty = false;
         if (record) {
+            for (k in data) {
+                if (record.values[k] === undefined || record.values[k] !== data[k]) {
+                    dirty = true;
+                    break;
+                }
+            }
             $.extend(record.values, data);
         } else {
+            dirty = true;
             record = {id: id, values: data};
             self.to_write.push(record);
         }
         var cached = _.detect(this.cache, function(x) {return x.id === id;});
         $.extend(cached.values, record.values);
-        this.on_change();
+        if (dirty)
+            this.on_change();
         var to_return = $.Deferred().then(callback);
-        setTimeout(function () {to_return.resolve({result: true});}, 0);
+        to_return.resolve({result: true});
         return to_return.promise();
     },
     unlink: function(ids, callback, error_callback) {
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 25dcca611bd..598cdd12c20 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -301,6 +301,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
         if (!this.ready) {
             return false;
         }
+        var dirty = false;
         var invalid = false,
             values = {},
             first_invalid_field = null;
@@ -313,6 +314,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
                     first_invalid_field = f;
                 }
             } else if (f.touched) {
+                dirty = true;
                 values[f.name] = f.get_value();
             }
         }
@@ -320,18 +322,19 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
             first_invalid_field.focus();
             this.on_invalid();
             return false;
-        } else {
+        } else if (dirty) {
             this.log("About to save", values);
             if (!this.datarecord.id) {
-                this.dataset.create(values, function(r) {
+                return this.dataset.create(values, function(r) {
                     self.on_created(r, success, prepend_on_create);
                 });
             } else {
-                this.dataset.write(this.datarecord.id, values, function(r) {
+                return this.dataset.write(this.datarecord.id, values, function(r) {
                     self.on_saved(r, success);
                 });
             }
-            return true;
+        } else {
+            return false;
         }
     },
     do_save_edit: function() {
@@ -1612,6 +1615,9 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
                 controller.on_record_loaded.add_last(function() {
                     once.resolve();
                 });
+                controller.on_form_changed.add_last(function() {
+                    self.save_form_view();
+                });
             }
             self.is_started.resolve();
         });
@@ -1692,6 +1698,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
         var self = this;
         if (!this.dataset)
             return [];
+        this.save_form_view();
         var val = this.dataset.delete_all ? [commands.delete_all()] : [];
         val = val.concat(_.map(this.dataset.ids, function(id) {
             var alter_order = _.detect(self.dataset.to_create, function(x) {return x.id === id;});
@@ -1708,9 +1715,38 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
             this.dataset.to_delete, function(x) {
                 return commands['delete'](x.id);}));
     },
+    save_form_view: function() {
+        if (this.viewmanager && this.viewmanager.views && this.viewmanager.active_view &&
+            this.viewmanager.views[this.viewmanager.active_view] &&
+            this.viewmanager.views[this.viewmanager.active_view].controller) {
+            var view = this.viewmanager.views[this.viewmanager.active_view].controller;
+            if (this.viewmanager.active_view === "form") {
+                var res = view.do_save();
+                if (res === false) {
+                    // ignore
+                } else if (res.isRejected()) {
+                    throw "Save or create on one2many dataset is not supposed to fail.";
+                } else if (!res.isResolved()) {
+                    throw "Asynchronous get_value() is not supported in form view.";
+                }
+            }
+        }
+    },
     validate: function() {
         this.invalid = false;
-        // TODO niv
+        var self = this;
+        var view = self.viewmanager.views[self.viewmanager.active_view].controller;
+        if(self.viewmanager.active_view === "list") {
+            return;
+        } else if (self.viewmanager.active_view === "form") {
+            for (var f in view.fields) {
+                f = view.fields[f];
+                if (f.invalid) {
+                    this.invalid = true;
+                    return;
+                }
+            }
+        }
     }
 });