From 69ddcb32346cd5b841ac5122aae7cd02c0edd710 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 4 Sep 2015 17:56:08 +0200
Subject: [PATCH] [IMP] base: default separator for view attribute alteration
 is now `,`

---
 openerp/addons/base/ir/ir_ui_view.py    | 4 +++-
 openerp/addons/base/tests/test_views.py | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index f36d5ed4db7..5157f1c9e80 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -533,7 +533,9 @@ class view(osv.osv):
                         value = child.text or ''
                         if child.get('add') or child.get('remove'):
                             assert not child.text
-                            separator = child.get('separator', None)
+                            separator = child.get('separator', ',')
+                            if separator == ' ':
+                                separator = None    # squash spaces
                             to_add = map(str.strip, child.get('add', '').split(separator))
                             to_remove = map(str.strip, child.get('remove', '').split(separator))
                             values = map(str.strip, node.get(attribute, '').split(separator))
diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py
index 542f7b8c046..57a491fc20f 100644
--- a/openerp/addons/base/tests/test_views.py
+++ b/openerp/addons/base/tests/test_views.py
@@ -744,9 +744,9 @@ class test_views(ViewCase):
             'arch': """
                 <footer position="attributes">
                     <attribute name="thing">bob tata lolo</attribute>
-                    <attribute name="thing" add="bibi" remove="tata"/>
+                    <attribute name="thing" add="bibi and co" remove="tata" separator=" " />
                     <attribute name="otherthing">bob, tata,lolo</attribute>
-                    <attribute name="otherthing" add="bibi" remove="tata, bob" separator=","/>
+                    <attribute name="otherthing" add="bibi" remove="tata, bob"/>
                 </footer>
             """
         })
@@ -766,7 +766,7 @@ class test_views(ViewCase):
                 E.p("Replacement data"),
                 E.footer(
                     E.button(name="action_next", type="object", string="New button"),
-                    thing="bob lolo bibi", otherthing="lolo,bibi"
+                    thing="bob lolo bibi and co", otherthing="lolo,bibi"
                 ),
                 string="Replacement title", version="7.0"))