From 173ade0fd419805b1399f5fd84df176d52a70a8e Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 20 Apr 2015 09:31:39 +0200
Subject: [PATCH 1/2] [IMP] let user decide if a filter is private when saving
 it

for filter combinations, inherit user_id from the filter we combine it
with
---
 web_advanced_filters/static/src/js/web_advanced_filters.js    | 2 ++
 web_advanced_filters/view/ir_filters.xml                      | 1 +
 .../wizard/ir_filters_combine_with_existing.py                | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/web_advanced_filters/static/src/js/web_advanced_filters.js b/web_advanced_filters/static/src/js/web_advanced_filters.js
index ae1a8ea1..e34ec023 100644
--- a/web_advanced_filters/static/src/js/web_advanced_filters.js
+++ b/web_advanced_filters/static/src/js/web_advanced_filters.js
@@ -171,6 +171,7 @@ openerp.web_advanced_filters = function(instance)
                         default_model_id: self.dataset._model.name,
                         default_domain: JSON.stringify(search.domain),
                         default_context: JSON.stringify(ctx),
+                        default_user_id: JSON.stringify(false),
                         form_view_ref: 'web_advanced_filters.form_ir_filters_save_new',
                     },
                 },
@@ -201,6 +202,7 @@ openerp.web_advanced_filters = function(instance)
                         ]
                     ),
                     default_context: JSON.stringify({}),
+                    default_user_id: JSON.stringify(false),
                     form_view_ref: 'web_advanced_filters.form_ir_filters_save_new',
                 },
             },
diff --git a/web_advanced_filters/view/ir_filters.xml b/web_advanced_filters/view/ir_filters.xml
index 32c562e6..10c1f327 100644
--- a/web_advanced_filters/view/ir_filters.xml
+++ b/web_advanced_filters/view/ir_filters.xml
@@ -37,6 +37,7 @@
                     <group>
                         <field name="name" />
                         <field name="is_default"/>
+                        <field name="user_id" domain="[('id', '=', uid)]" widget="selection" />
                     </group>
                     <footer>
                         <button class="oe_highlight" type="object" name="button_save" string="Save" />
diff --git a/web_advanced_filters/wizard/ir_filters_combine_with_existing.py b/web_advanced_filters/wizard/ir_filters_combine_with_existing.py
index b6d6668c..6efd9a13 100644
--- a/web_advanced_filters/wizard/ir_filters_combine_with_existing.py
+++ b/web_advanced_filters/wizard/ir_filters_combine_with_existing.py
@@ -62,7 +62,7 @@ class IrFiltersCombineWithExisting(TransientModel):
                             'domain': str(domain),
                             'context': this.context,
                             'model_id': this.model,
-                            'user_id': uid,
+                            'user_id': this.filter_id.user_id.id or False,
                         })],
                     })
         elif this.action == 'complement':
@@ -81,7 +81,7 @@ class IrFiltersCombineWithExisting(TransientModel):
                             'domain': str(domain),
                             'context': this.context,
                             'model_id': this.model,
-                            'user_id': uid,
+                            'user_id': this.filter_id.user_id.id or False,
                         })],
                     })
 

From a7c29dfe49c138e9e03c2391f1b6a14f31ad9a8a Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 20 Apr 2015 14:03:03 +0200
Subject: [PATCH 2/2] [IMP] use same UI as when saving a normal filter

---
 web_advanced_filters/i18n/nl.po          |  5 +++++
 web_advanced_filters/model/ir_filters.py | 14 +++++++++++++-
 web_advanced_filters/view/ir_filters.xml |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/web_advanced_filters/i18n/nl.po b/web_advanced_filters/i18n/nl.po
index 45026482..9445741d 100644
--- a/web_advanced_filters/i18n/nl.po
+++ b/web_advanced_filters/i18n/nl.po
@@ -60,6 +60,11 @@ msgstr "Testen %s"
 msgid "or"
 msgstr "or"
 
+#. module: web_advanced_filters
+#: field:ir.filters,save_as_public:0
+msgid "Share with all users"
+msgstr "Deel met alle gebruikers"
+
 #. module: web_advanced_filters
 #: field:ir.filters,complement_filter_ids:0
 msgid "Remove result of filters"
diff --git a/web_advanced_filters/model/ir_filters.py b/web_advanced_filters/model/ir_filters.py
index 488c5a02..6c4058ab 100644
--- a/web_advanced_filters/model/ir_filters.py
+++ b/web_advanced_filters/model/ir_filters.py
@@ -164,11 +164,18 @@ class IrFilters(Model):
             _evaluate_get, type='boolean', multi='evaluate',
             string='Always evaluate this filter before using it',
             help='This is necessary if this filter contains x2many fields with'
-            '_auto_join activated')
+            '_auto_join activated'),
+        'save_as_public': fields.function(
+            lambda self, cr, uid, ids, *args, **kwargs:
+            dict((i, False) for i in ids),
+            fnct_inv=lambda *args, **kwargs: None,
+            type='boolean',
+            string='Share with all users'),
     }
 
     _defaults = {
         'active': True,
+        'save_as_public': False,
     }
 
     def _evaluate(self, cr, uid, ids, context=None):
@@ -245,3 +252,8 @@ class IrFilters(Model):
             "update ir_module_module set state='to remove' where "
             "name='advanced_filters' and state not in "
             "('uninstalled', 'to remove')")
+
+    def create(self, cr, uid, values, context=None):
+        values.setdefault(
+            'user_id', False if values.get('save_as_public') else uid)
+        return super(IrFilters, self).create(cr, uid, values, context=context)
diff --git a/web_advanced_filters/view/ir_filters.xml b/web_advanced_filters/view/ir_filters.xml
index 10c1f327..4054aade 100644
--- a/web_advanced_filters/view/ir_filters.xml
+++ b/web_advanced_filters/view/ir_filters.xml
@@ -37,7 +37,7 @@
                     <group>
                         <field name="name" />
                         <field name="is_default"/>
-                        <field name="user_id" domain="[('id', '=', uid)]" widget="selection" />
+                        <field name="save_as_public" />
                     </group>
                     <footer>
                         <button class="oe_highlight" type="object" name="button_save" string="Save" />