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] [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,
                         })],
                     })