From 08ab922468980b5fbba0288a121822b9f5f64742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 14 Mar 2014 17:51:13 +0100
Subject: [IMP] [REF] mass_mailing: first draft for the saas-4 refactoring.
 Improved mass mailing form view, that is used as a central point to create
 new mailings. Added concept of contact list (based on partner, or leads (to
 add)), as well as contact (a list of name / email to import). Mailings are
 done un contact list to simplify the way it works. Added a kanban view of
 templates, with a flag to filter only mass mailing templates (to avoid havign
 to deal with acknoledgments). Using campaigns is now an option (a group),
 mailings can be done without having to deal with campaigns. Mailings and
 campaigns now have a status, used to display their kanban view.

bzr revid: tde@openerp.com-20140314165113-g4gvvifrhr2nfu15
---
 addons/mass_mailing/static/src/css/email_template.css | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 addons/mass_mailing/static/src/css/email_template.css

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/css/email_template.css b/addons/mass_mailing/static/src/css/email_template.css
new file mode 100644
index 00000000000..62766ac15b4
--- /dev/null
+++ b/addons/mass_mailing/static/src/css/email_template.css
@@ -0,0 +1,19 @@
+.openerp .oe_kanban_email_template {
+    width: 360px;
+    min-height: 270px !important;
+}
+
+
+.html_preview {
+    width: 600px;
+    height: 400px;
+    -webkit-transform: scale(.50);
+    -ms-transform: scale(.50);
+    transform: scale(.50);
+    -webkit-transform-origin: 0 0; 
+    -ms-transform-origin: 0 0; 
+    transform-origin: 0 0; 
+    border: 2px solid gray;
+    margin: 0 0px -300px 0;
+    overflow: hidden !important;
+}
-- 
cgit v1.2.3


From 61f90f4581a2186145a4a3d2b62cbd7ef2d5021f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 17 Mar 2014 17:09:19 +0100
Subject: [IMP] mass_mailing: campaign and mailing kanban view update to match
 new specs, removed unnecessary CSS.

Also added a sent field on mail mail statistics, to be able to count the
number of really sent emails.

bzr revid: tde@openerp.com-20140317160919-7sx7ja28zaxid67t
---
 .../mass_mailing/static/src/css/mass_mailing.css   | 64 ++++------------------
 addons/mass_mailing/static/src/js/mass_mailing.js  |  2 +-
 2 files changed, 11 insertions(+), 55 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index e54ce46c025..60f8478c479 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,61 +1,17 @@
-.openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_campaign {
+.openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign {
     /* Customize to manage content */
-    width: 552px;
-    min-height: 278px !important;
+    width: 360px;
+    min-height: 254px !important;
     /* End of customize */
 }
 
-.openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_segment {
-    /* Customize to manage content */
-    width: 282px;
-    min-height: 246px !important;
-    /* End of customize */
+.openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right {
+    float: right;
 }
 
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_stats {
-    width: 122px; /* Manage space in between stats */
-    display: inline-block;
-    margin: 2px 5px 0px 5px;
-    text-align: center;
-    border: 1px solid rgba(0, 0, 0, 0.16);
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    background-color: #FFFFFF;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_result {
-    font-weight: bold;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_gauge {
-    width: 120px;
-    height: 120px;
-    display: inline-block;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_kanban_content div.oe_sparkline_container {
-    height: 60px;
-    width: 120px;
-    display: inline-block;
-    margin: 8px 5px 0px 5px;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_sparkline_bar_title {
-    text-align: center;
-    display: inline;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_sparkline_bar {
-    width: 100px;
-    height: 60px;
-    display: inline-block;
+.openerp .oe_kanban_view .oe_kanban_mass_mailing {
+    /* Customize to manage content */
+    width: 280px;
+    min-height: 150px !important;
+    /* End of customize */
 }
-
-/* 
- * Campaign related CSS
- */
-
-
-/* 
- * Segment related CSS
- */
diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index 93f63f01ad1..c0dc621984f 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -3,7 +3,7 @@ openerp.mass_mailing = function(openerp) {
     openerp.web_kanban.KanbanRecord.include({
         on_card_clicked: function (event) {
             if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
-                this.$('.oe_mass_mailings a').first().click();
+                this.$('.oe_mailings').click();
             } else {
                 this._super.apply(this, arguments);
             }
-- 
cgit v1.2.3


From 7945d4bb9719bb3af52a1b112757a8d47a48d669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 24 Mar 2014 18:10:17 +0100
Subject: [IMP] email_template: added a minimal form view + some custo in mass
 mailing views

bzr revid: tde@openerp.com-20140324171017-mcv5m493zpba5tgd
---
 addons/mass_mailing/static/src/css/email_template.css | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/css/email_template.css b/addons/mass_mailing/static/src/css/email_template.css
index 62766ac15b4..823a8d9efc6 100644
--- a/addons/mass_mailing/static/src/css/email_template.css
+++ b/addons/mass_mailing/static/src/css/email_template.css
@@ -3,17 +3,28 @@
     min-height: 270px !important;
 }
 
+.form_html_preview {
+    width: 600px;
+    max-height: 1000px;
+    -webkit-transform: scale(.50);
+    -ms-transform: scale(.50);
+    transform: scale(.50);
+    -webkit-transform-origin: 0 0; 
+    -ms-transform-origin: 0 0; 
+    transform-origin: 0 0; 
+    margin: 0 0px -300px 0;
+    overflow: visible !important;
+}
 
-.html_preview {
+.kanban_html_preview {
     width: 600px;
-    height: 400px;
+    height: 600px;
     -webkit-transform: scale(.50);
     -ms-transform: scale(.50);
     transform: scale(.50);
     -webkit-transform-origin: 0 0; 
     -ms-transform-origin: 0 0; 
     transform-origin: 0 0; 
-    border: 2px solid gray;
     margin: 0 0px -300px 0;
     overflow: hidden !important;
 }
-- 
cgit v1.2.3


From 85283237ad12965dde4a7cb3b22348aa208061f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 4 Apr 2014 17:03:50 +0200
Subject: [IMP] mass_mailing: still working / refactorign the form view of
 mailing to ease the use (mmmh).

Mainly :
- added website as a dependance to have the rich editor (well ...)
- form view refactoring
- some fileds will be added / removed to ease the mailign definition

bzr revid: tde@openerp.com-20140404150350-x00wxgzp4c71zmzv
---
 addons/mass_mailing/static/src/css/mass_mailing.css | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index 60f8478c479..ec833f5f2b0 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,8 +1,5 @@
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign {
-    /* Customize to manage content */
     width: 360px;
-    min-height: 254px !important;
-    /* End of customize */
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right {
@@ -10,8 +7,5 @@
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing {
-    /* Customize to manage content */
     width: 280px;
-    min-height: 150px !important;
-    /* End of customize */
 }
-- 
cgit v1.2.3


From f84a23ed5c7e80f2ab3cd64f1292268f4ffac748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 4 Apr 2014 17:34:32 +0200
Subject: [IMP] mass_mailing: campaigns: some refactoring ! - state is now
 stage_id, many2one towaqrds a newly added stage model, allowing to tune your
 process of mailign campaigns. Todo: menu to configure stages + access rights.
 - cleaned campaign kanban view, to be smaller. - added statbuttons in form
 view of campaigns

bzr revid: tde@openerp.com-20140404153432-b171x0frbfepyfkn
---
 addons/mass_mailing/static/src/css/mass_mailing.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index ec833f5f2b0..ff54b8cbfac 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,5 +1,5 @@
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign {
-    width: 360px;
+    width: 280px;
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right {
-- 
cgit v1.2.3


From 58e53d2e31e3bcdfe11a02424babd301e573c657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 8 Apr 2014 13:30:29 +0200
Subject: [IMP] mass_mailing: form view improvements using stat button + failed
 tracking on statistics. This comes with a web branch to fixes the
 statbuttons.

bzr revid: tde@openerp.com-20140408113029-ezjlbzbn3j26f43w
---
 addons/mass_mailing/static/src/css/email_template.css | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/css/email_template.css b/addons/mass_mailing/static/src/css/email_template.css
index 823a8d9efc6..495c201a172 100644
--- a/addons/mass_mailing/static/src/css/email_template.css
+++ b/addons/mass_mailing/static/src/css/email_template.css
@@ -3,19 +3,6 @@
     min-height: 270px !important;
 }
 
-.form_html_preview {
-    width: 600px;
-    max-height: 1000px;
-    -webkit-transform: scale(.50);
-    -ms-transform: scale(.50);
-    transform: scale(.50);
-    -webkit-transform-origin: 0 0; 
-    -ms-transform-origin: 0 0; 
-    transform-origin: 0 0; 
-    margin: 0 0px -300px 0;
-    overflow: visible !important;
-}
-
 .kanban_html_preview {
     width: 600px;
     height: 600px;
-- 
cgit v1.2.3


From f908137d768771ddf58cca0346727d12185f21a8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 18:20:28 +0200
Subject: [IMP] Template Editor

bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
---
 addons/mass_mailing/static/src/js/mass_mailing.js  | 71 +++++++++++++++++++---
 .../mass_mailing/static/src/xml/mass_mailing.xml   | 13 ++++
 2 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100644 addons/mass_mailing/static/src/xml/mass_mailing.xml

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index c0dc621984f..7a52b785714 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -1,13 +1,70 @@
-openerp.mass_mailing = function(openerp) {
+openerp.mass_mailing = function (instance) {
+    var _t = instance.web._t;
+	debugger;
 
-    openerp.web_kanban.KanbanRecord.include({
-        on_card_clicked: function (event) {
-            if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
-                this.$('.oe_mailings').click();
+    openerp.mass_mailing = function(openerp) {
+        openerp.web_kanban.KanbanRecord.include({
+            on_card_clicked: function (event) {
+                if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
+                    this.$('.oe_mailings').click();
+                } else {
+                    this._super.apply(this, arguments);
+                }
+            },
+        });
+    };
+
+    instance.web.form.CharDomainButton = instance.web.form.AbstractField.extend({
+        template: 'CharDomainButton',
+        init: function(field_manager, node) {
+            this._super.apply(this, arguments);
+        },
+        start: function() {
+            var self=this;
+            this._super.apply(this, arguments);
+            $('button', this.$el).on('click', self.on_click);
+            this.set_button();
+        },
+        set_button: function() {
+            if (this.get('value')) {
+                // TODO: rpc to copute X
+                $('.oe_domain_count', this.$el).text('X records selected');
+                $('button span', this.$el).text(' Change selection');
             } else {
-                this._super.apply(this, arguments);
-            }
+                $('.oe_domain_count', this.$el).text('0 record selected');
+                $('button span', this.$el).text(' Select records');
+            };
         },
+        on_click: function(ev) {
+            var self = this;
+            var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
+            this.pop = new instance.web.form.SelectCreatePopup(this);
+            this.pop.select_element(
+                model, {title: 'Select records...'},
+                [], this.build_context());
+            this.pop.on("elements_selected", self, function() {
+                var self2 = this;
+                var search_data = this.pop.searchview.build_search_data()
+                instance.web.pyeval.eval_domains_and_contexts({
+                    domains: search_data.domains,
+                    contexts: search_data.contexts,
+                    group_by_seq: search_data.groupbys || []
+                }).then(function (results) {
+                    var domain = self2.pop.dataset.domain.concat(results.domain || []);
+                    self.set_value(JSON.stringify(domain))
+                });
+            });
+            event.preventDefault();
+        },
+        set_value: function(value_) {
+            var self = this;
+            this.set('value', value_ || false);
+            this.set_button();
+         },
     });
 
+    instance.web.form.widgets = instance.web.form.widgets.extend(
+        {'char_domain': 'instance.web.form.CharDomainButton'}
+    );
+
 };
diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.xml b/addons/mass_mailing/static/src/xml/mass_mailing.xml
new file mode 100644
index 00000000000..2b20e450113
--- /dev/null
+++ b/addons/mass_mailing/static/src/xml/mass_mailing.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+    <t t-name="CharDomainButton">
+        <div class="oe_form_field">
+            <span class="oe_domain_count"/>
+            <button class="oe_button oe_link" type="button"
+                t-att-style="widget.node.attrs.style"
+                t-att-accesskey="widget.node.attrs.accesskey">
+                <span class="fa fa-arrow-right"/>
+            </button>
+        </div>
+    </t>
+</template>
-- 
cgit v1.2.3


From 34e618965a486e6a64a258a9cd0c85ca7dd99a79 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 14 Apr 2014 10:10:35 +0200
Subject: [IMP] commment

bzr revid: fp@tinyerp.com-20140414081035-9ixrag5oly2q0emb
---
 addons/mass_mailing/static/src/js/mass_mailing.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index 7a52b785714..5936d3aabbf 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -1,7 +1,5 @@
 openerp.mass_mailing = function (instance) {
     var _t = instance.web._t;
-	debugger;
-
     openerp.mass_mailing = function(openerp) {
         openerp.web_kanban.KanbanRecord.include({
             on_card_clicked: function (event) {
@@ -50,6 +48,7 @@ openerp.mass_mailing = function (instance) {
                     contexts: search_data.contexts,
                     group_by_seq: search_data.groupbys || []
                 }).then(function (results) {
+                    // if selected IDS change domain
                     var domain = self2.pop.dataset.domain.concat(results.domain || []);
                     self.set_value(JSON.stringify(domain))
                 });
-- 
cgit v1.2.3


From 48d7a6fa6ca13208ca6468eaee127092fec60c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 Apr 2014 16:40:11 +0200
Subject: [CLEAN] mass_mailing: rmeoved dead stuff

bzr revid: tde@openerp.com-20140414144011-awu4g35etq9s4gje
---
 addons/mass_mailing/static/src/js/mass_mailing.js   | 2 +-
 addons/mass_mailing/static/src/xml/mass_mailing.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index cf4927e908e..58590001355 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -19,7 +19,7 @@ openerp.mass_mailing = function (instance) {
         start: function() {
             var self=this;
             this._super.apply(this, arguments);
-            $('button', this.$el).on('click', self.on_click);
+            $('button.select_records', this.$el).on('click', self.on_click);
             this.set_button();
         },
         set_button: function() {
diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.xml b/addons/mass_mailing/static/src/xml/mass_mailing.xml
index 2b20e450113..e9c3299cc30 100644
--- a/addons/mass_mailing/static/src/xml/mass_mailing.xml
+++ b/addons/mass_mailing/static/src/xml/mass_mailing.xml
@@ -3,7 +3,7 @@
     <t t-name="CharDomainButton">
         <div class="oe_form_field">
             <span class="oe_domain_count"/>
-            <button class="oe_button oe_link" type="button"
+            <button class="oe_button oe_link select_records" type="button"
                 t-att-style="widget.node.attrs.style"
                 t-att-accesskey="widget.node.attrs.accesskey">
                 <span class="fa fa-arrow-right"/>
-- 
cgit v1.2.3


From 6179d9b6a24a754e0015709665921670479fb338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 11:25:03 +0200
Subject: [IMP] mass_mailing: finishing refactoring for the new func flow. -
 cleaned reply-to management, now displaying an alert but simplifying the
 underlying model about options available / not available for certain
 documents; - cleaned a bit the form view; - date -> create_date, and added a
 sent_date to distinguish the two; - removed dead code; - first draft of
 improving the chardomain widget

bzr revid: tde@openerp.com-20140415092503-q1hku1rh12ldy9i1
---
 addons/mass_mailing/static/src/js/mass_mailing.js | 48 +++++++++++++++--------
 1 file changed, 31 insertions(+), 17 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index 58590001355..a033903ef7a 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -16,17 +16,28 @@ openerp.mass_mailing = function (instance) {
         init: function(field_manager, node) {
             this._super.apply(this, arguments);
         },
+        initialize_content: function () {
+            this.on("change:effective_readonly", this, this.render_value);
+        },
         start: function() {
             var self=this;
             this._super.apply(this, arguments);
             $('button.select_records', this.$el).on('click', self.on_click);
             this.set_button();
         },
+        render_value: function () {
+            console.log('cacaprout', this.$('.select_records'));
+            var self = this;
+            this.$('.select_records').toggle(! this.get('effective_readonly'));
+        },
+        set_value: function(value_) {
+            var self = this;
+            this.set('value', value_ || false);
+            this.set_button();
+         },
         set_button: function() {
             var self = this;
-            // debugger
             if (this.get('value')) {
-                // TODO: rpc to copute X
                 var domain = instance.web.pyeval.eval('domain', this.get('value'));
                 var relation = this.getParent().fields.mailing_model.get('value')[0];
                 var ds = new instance.web.DataSetStatic(self, relation, self.build_context());
@@ -40,32 +51,35 @@ openerp.mass_mailing = function (instance) {
             };
         },
         on_click: function(ev) {
+            console.log(this.get('effective_readonly'));
             var self = this;
             var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
             this.pop = new instance.web.form.SelectCreatePopup(this);
             this.pop.select_element(
                 model, {title: 'Select records...'},
                 [], this.build_context());
-            this.pop.on("elements_selected", self, function() {
-                var self2 = this;
-                var search_data = this.pop.searchview.build_search_data()
-                instance.web.pyeval.eval_domains_and_contexts({
-                    domains: search_data.domains,
-                    contexts: search_data.contexts,
-                    group_by_seq: search_data.groupbys || []
-                }).then(function (results) {
-                    // if selected IDS change domain
-                    var domain = self2.pop.dataset.domain.concat(results.domain || []);
+            this.pop.on("elements_selected", self, function(element_ids) {
+                if (this.pop.$('input.oe_list_record_selector').prop('checked')) {
+                    var search_data = this.pop.searchview.build_search_data();
+                    var domain_done = instance.web.pyeval.eval_domains_and_contexts({
+                        domains: search_data.domains,
+                        contexts: search_data.contexts,
+                        group_by_seq: search_data.groupbys || []
+                    }).then(function (results) {
+                        return results.domain;
+                    });
+                }
+                else {
+                    var domain = ["id", "in", element_ids];
+                    var domain_done = $.Deferred().resolve(domain);
+                }
+                $.when(domain_done).then(function (domain) {
+                    var domain = self.pop.dataset.domain.concat(domain || []);
                     self.set_value(JSON.stringify(domain))
                 });
             });
             event.preventDefault();
         },
-        set_value: function(value_) {
-            var self = this;
-            this.set('value', value_ || false);
-            this.set_button();
-         },
     });
 
     instance.web.form.widgets = instance.web.form.widgets.extend(
-- 
cgit v1.2.3


From 90d9b497b3a69da385fbdf25931ed66ce6609b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 12:13:42 +0200
Subject: [FIX] mass_mailing: various fixes in campaign view and basic
 management

bzr revid: tde@openerp.com-20140415101342-7vvadykp1udz6hgs
---
 addons/mass_mailing/static/src/css/mass_mailing.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index ff54b8cbfac..cc91e8acf58 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,5 +1,6 @@
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign {
     width: 280px;
+    min-height: 141px;
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right {
@@ -8,4 +9,5 @@
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing {
     width: 280px;
+    min-height: 141px;
 }
-- 
cgit v1.2.3


From 4808ca3796514701dc20a0ef96cddeedbf61e90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 14:52:22 +0200
Subject: [FIX] mass_mailing: various fixed in chardomain widget

bzr revid: tde@openerp.com-20140415125222-uzvzgzo5gx6hmgor
---
 addons/mass_mailing/static/src/js/mass_mailing.js | 27 +++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index a033903ef7a..c91fe900923 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -11,32 +11,32 @@ openerp.mass_mailing = function (instance) {
         },
     });
 
-    instance.web.form.CharDomainButton = instance.web.form.AbstractField.extend({
-        template: 'CharDomainButton',
+    instance.web.form.CharDomainButton = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
         init: function(field_manager, node) {
             this._super.apply(this, arguments);
         },
-        initialize_content: function () {
-            this.on("change:effective_readonly", this, this.render_value);
-        },
         start: function() {
             var self=this;
             this._super.apply(this, arguments);
-            $('button.select_records', this.$el).on('click', self.on_click);
-            this.set_button();
+            this.on("change:effective_readonly", this, function () {
+                this.display_field();
+                this.render_value();
+            });
+            this.$('button.select_records').on('click', self.on_click);
+            this.display_field();
+            return this._super();
         },
-        render_value: function () {
-            console.log('cacaprout', this.$('.select_records'));
-            var self = this;
-            this.$('.select_records').toggle(! this.get('effective_readonly'));
+        render_value: function() {
+            this.$('button.select_records').css('visibility', this.get('effective_readonly') ? 'hidden': '');
         },
         set_value: function(value_) {
             var self = this;
             this.set('value', value_ || false);
-            this.set_button();
+            this.display_field();
          },
-        set_button: function() {
+        display_field: function() {
             var self = this;
+            this.$el.html(instance.web.qweb.render("CharDomainButton", {widget: this}));
             if (this.get('value')) {
                 var domain = instance.web.pyeval.eval('domain', this.get('value'));
                 var relation = this.getParent().fields.mailing_model.get('value')[0];
@@ -51,7 +51,6 @@ openerp.mass_mailing = function (instance) {
             };
         },
         on_click: function(ev) {
-            console.log(this.get('effective_readonly'));
             var self = this;
             var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
             this.pop = new instance.web.form.SelectCreatePopup(this);
-- 
cgit v1.2.3


From da7cb60cfc6bf5838c8c7bd7032f5e58cb54e0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 15:39:33 +0200
Subject: [MOVE] Moved mass mailing chardomain widget to web.

bzr revid: tde@openerp.com-20140415133933-1uqlj3yujdwozz2m
---
 addons/mass_mailing/static/src/js/mass_mailing.js  | 75 ----------------------
 .../mass_mailing/static/src/xml/mass_mailing.xml   | 13 ----
 2 files changed, 88 deletions(-)
 delete mode 100644 addons/mass_mailing/static/src/xml/mass_mailing.xml

(limited to 'addons/mass_mailing/static/src')

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index c91fe900923..ef456c40bbf 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -10,79 +10,4 @@ openerp.mass_mailing = function (instance) {
             }
         },
     });
-
-    instance.web.form.CharDomainButton = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
-        init: function(field_manager, node) {
-            this._super.apply(this, arguments);
-        },
-        start: function() {
-            var self=this;
-            this._super.apply(this, arguments);
-            this.on("change:effective_readonly", this, function () {
-                this.display_field();
-                this.render_value();
-            });
-            this.$('button.select_records').on('click', self.on_click);
-            this.display_field();
-            return this._super();
-        },
-        render_value: function() {
-            this.$('button.select_records').css('visibility', this.get('effective_readonly') ? 'hidden': '');
-        },
-        set_value: function(value_) {
-            var self = this;
-            this.set('value', value_ || false);
-            this.display_field();
-         },
-        display_field: function() {
-            var self = this;
-            this.$el.html(instance.web.qweb.render("CharDomainButton", {widget: this}));
-            if (this.get('value')) {
-                var domain = instance.web.pyeval.eval('domain', this.get('value'));
-                var relation = this.getParent().fields.mailing_model.get('value')[0];
-                var ds = new instance.web.DataSetStatic(self, relation, self.build_context());
-                ds.call('search_count', [domain]).then(function (results) {
-                    $('.oe_domain_count', self.$el).text(results + ' records selected');
-                    $('button span', self.$el).text(' Change selection');
-                });
-            } else {
-                $('.oe_domain_count', this.$el).text('0 record selected');
-                $('button span', this.$el).text(' Select records');
-            };
-        },
-        on_click: function(ev) {
-            var self = this;
-            var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
-            this.pop = new instance.web.form.SelectCreatePopup(this);
-            this.pop.select_element(
-                model, {title: 'Select records...'},
-                [], this.build_context());
-            this.pop.on("elements_selected", self, function(element_ids) {
-                if (this.pop.$('input.oe_list_record_selector').prop('checked')) {
-                    var search_data = this.pop.searchview.build_search_data();
-                    var domain_done = instance.web.pyeval.eval_domains_and_contexts({
-                        domains: search_data.domains,
-                        contexts: search_data.contexts,
-                        group_by_seq: search_data.groupbys || []
-                    }).then(function (results) {
-                        return results.domain;
-                    });
-                }
-                else {
-                    var domain = ["id", "in", element_ids];
-                    var domain_done = $.Deferred().resolve(domain);
-                }
-                $.when(domain_done).then(function (domain) {
-                    var domain = self.pop.dataset.domain.concat(domain || []);
-                    self.set_value(JSON.stringify(domain))
-                });
-            });
-            event.preventDefault();
-        },
-    });
-
-    instance.web.form.widgets = instance.web.form.widgets.extend(
-        {'char_domain': 'instance.web.form.CharDomainButton'}
-    );
-
 };
diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.xml b/addons/mass_mailing/static/src/xml/mass_mailing.xml
deleted file mode 100644
index e9c3299cc30..00000000000
--- a/addons/mass_mailing/static/src/xml/mass_mailing.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template>
-    <t t-name="CharDomainButton">
-        <div class="oe_form_field">
-            <span class="oe_domain_count"/>
-            <button class="oe_button oe_link select_records" type="button"
-                t-att-style="widget.node.attrs.style"
-                t-att-accesskey="widget.node.attrs.accesskey">
-                <span class="fa fa-arrow-right"/>
-            </button>
-        </div>
-    </t>
-</template>
-- 
cgit v1.2.3