From 8fd72aff40eb757013eaee6a0c182c9e1acee7c5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:12:21 +0200
Subject: [PATCH 1/8] [FIX] share: avoid crash in web addon with empty share
 filter

bzr revid: odo@openerp.com-20110505161221-d4k3y8v81qz2wbrp
---
 addons/share/web/controllers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
index aa689019259..1b57d960e99 100644
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -13,7 +13,7 @@ class ShareWizardController(openerp.controllers.SecuredController):
     _cp_path = "/share"
 
     @expose()
-    def index(self, domain, search_domain, context, view_id, action_id=None):
+    def index(self, domain, context, view_id, search_domain='[]', action_id=None):
         context = ast.literal_eval(context)
 
         if not action_id:

From ef4c13fad553cbdae08cc82a8f07991f4539f1b6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:14:26 +0200
Subject: [PATCH 2/8] [FIX] share: hide Share button when user does not belong
 to Sharing group

bzr revid: odo@openerp.com-20110505161426-c4ocuy98mgbceq5w
---
 addons/share/web/editors.py         | 14 ++++++++++----
 addons/share/wizard/share_wizard.py | 12 ++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py
index fd6199a4fd6..1928b644073 100644
--- a/addons/share/web/editors.py
+++ b/addons/share/web/editors.py
@@ -11,8 +11,13 @@ class ShareActionEditor(openobject.templating.TemplateEditor):
         share_opener_insertion = output.index(
                 '\n',
                 output.index(self.ADD_SHARE_SECTION)) + 1
-        return output[:share_opener_insertion] + \
-               '''<div id="share-wizard" class="sideheader-a"><h2>${_("Sharing")}</h2></div>
+        return output[:share_opener_insertion] + '''
+    <%
+        if 'has_share' not in cp.session:
+            cp.session['has_share'] = rpc.RPCProxy('share.wizard').has_share()
+    %>
+    % if cp.session['has_share']:
+        <div id="share-wizard" class="sideheader-a"><h2>${_("Sharing")}</h2></div>
                      <ul class="clean-a">
                          <li>
                              <a id="sharing" href="#share">${_("Share")}</a>
@@ -33,8 +38,9 @@ class ShareActionEditor(openobject.templating.TemplateEditor):
                                });
                            });
                        </script>
-                       \n''' + \
-                output[share_opener_insertion:]
+                       \n
+    % endif
+''' + output[share_opener_insertion:]
 
     def edit(self, template, template_text):
         return self.insert_share_link(
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 48243c57dda..755e4777eca 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -50,6 +50,18 @@ class share_create(osv.osv_memory):
     _name = 'share.wizard'
     _description = 'Share Wizard'
 
+    def has_group(self, cr, uid, module, group_xml_id, context=None):
+        """Returns True if current user is a member of the group identified by the module, group_xml_id pair."""
+        # if the group was deleted or does not exist, we say NO (better safe than sorry)
+        try:
+            model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, group_xml_id)
+        except ValueError:
+            return False
+        return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
+
+    def has_share(self, cr, uid, context=None):
+        return self.has_group(cr, uid, module='share', group_xml_id='group_share_user', context=context)
+
     _columns = {
         'action_id': fields.many2one('ir.actions.act_window', 'Action to share', required=True,
                 help="The action that opens the screen containing the data you wish to share."),

From fe6bc5db26b55b8bc20a49036d30ac6aa0b98170 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:15:39 +0200
Subject: [PATCH 3/8] [FIX] share: bumped up module version after changes to
 web addon

This will notify the web clients to refresh the web addon.

bzr revid: odo@openerp.com-20110505161539-cp21x19ii81wr3o6
---
 addons/share/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 7a68936970d..9b1b331abb2 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     "name" : "Sharing Tools",
-    "version" : "1.3",
+    "version" : "1.3.1",
     "depends" : ["base"],
     "author" : "OpenERP SA",
     "category": 'Generic Modules',

From b26d354d34054eb102196f02bf79e2c8a956e6ce Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:18:53 +0200
Subject: [PATCH 4/8] [FIX] share: share users with multi-shares should keep
 same home action

Previously they were assigned the generic menu as home action
but that is not very relevant because it does not contain their
shortcuts most of the time, and also this breaks the web client
in v6.0 as it does not support the Menu as home action.

bzr revid: odo@openerp.com-20110505161853-y1gc21wdn6k2wg41
---
 addons/share/wizard/share_wizard.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 755e4777eca..cae12ddbfe7 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -156,7 +156,6 @@ class share_create(osv.osv_memory):
 
     def _setup_action_and_shortcut(self, cr, uid, wizard_data, user_ids, new_users, context=None):
         user_obj = self.pool.get('res.users')
-        menu_action_id = user_obj._get_menu(cr, uid, context=context)
         values = {
             'name': (_('%s (Shared)') % wizard_data.action_id.name)[:64],
             'domain': wizard_data.domain,
@@ -169,9 +168,11 @@ class share_create(osv.osv_memory):
         for user_id in user_ids:
             action_id = self._create_shortcut(cr, user_id, values)
             if new_users:
+                # We do this only for new share users, as existing ones already have their initial home
+                # action. Resetting to the default menu does not work well as the menu is rather empty
+                # and does not contain the shortcuts in most cases.
                 user_obj.write(cr, 1, [user_id], {'action_id': action_id})
-            else:
-                user_obj.write(cr, 1, [user_id], {'action_id': menu_action_id})
+
 
     def _get_recursive_relations(self, cr, uid, model, ttypes, relation_fields=None, suffix=None, context=None):
         """Returns list of tuples representing recursive relationships of type ``ttypes`` starting from

From b1bcc6b036674f674ee3ef9f2568743faddfc4ee Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:22:31 +0200
Subject: [PATCH 5/8] [FIX] share: use empty domain for shared actions, as
 ir.rules do enforce the filtering.

We must not use a normal domain for the shared action,
because it may be constructed with records the user may
not see (e.g. sharing tasks from a certain project does
not give right to see the project itself.)
Evaluating the domain of an action requires rights that
the user will not have. Moreover, this is useless because
ir.rules are created with each share access to filter
appropriately the records, and they are evaluated as
root user without risk of failed access right.

bzr revid: odo@openerp.com-20110505162231-vbkh4vqrtk93yg1q
---
 addons/share/wizard/share_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index cae12ddbfe7..f153f26f4d4 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -158,7 +158,7 @@ class share_create(osv.osv_memory):
         user_obj = self.pool.get('res.users')
         values = {
             'name': (_('%s (Shared)') % wizard_data.action_id.name)[:64],
-            'domain': wizard_data.domain,
+            'domain': '[]',
             'context': wizard_data.action_id.context,
             'res_model': wizard_data.action_id.res_model,
             'view_mode': wizard_data.action_id.view_mode,

From 4d9ce4260f820a762095f97ea307859bc782d038 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:25:08 +0200
Subject: [PATCH 6/8] [FIX] share: current user restrictions were not properly
 copied

This could lead to security issues, because shared users could
have more access rights than the user sharing the data.
The mechanism was working to copy them, but unfortunately not
working.

bzr revid: odo@openerp.com-20110505162508-3r12bl7rg1hpyzps
---
 addons/share/wizard/share_wizard.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index f153f26f4d4..364e4127b93 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -271,21 +271,21 @@ class share_create(osv.osv_memory):
         user_obj = self.pool.get('res.users')
         rule_obj = self.pool.get('ir.rule')
         current_user = user_obj.browse(cr, uid, uid, context=context)
-        completed_models = set()
+        rules_done = set()
         for group in current_user.groups_id:
             for dummy, model in fields_relations:
-                if model.id in completed_models:
-                    continue
-                completed_models.add(model.id)
                 for rule in group.rule_groups:
-                    if rule.model_id == model.id:
+                    if rule.id in rules_done:
+                        continue
+                    rules_done.add(rule.id)
+                    if rule.model_id.id == model.id:
                         if 'user.' in rule.domain_force:
                             # Above pattern means there is likely a condition
                             # specific to current user, so we must copy the rule using
                             # the evaluated version of the domain.
                             # And it's better to copy one time too much than too few
                             rule_obj.copy(cr, 1, rule.id, default={
-                                'name': '%s (%s)' %(rule.name, _('(Copy for sharing)')),
+                                'name': '%s %s' %(rule.name, _('(Copy for sharing)')),
                                 'groups': [(6,0,[group_id])],
                                 'domain_force': rule.domain, # evaluated version!
                             })

From 6d512bb2da7b113e7dd08b91f4c55adbfc167b24 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:27:01 +0200
Subject: [PATCH 7/8] [FIX] share: multi-sharing with an empty filter was not
 working

An empty share filter should be translated as a dummy ir.rule
to make sure it is properly combined with other rules after
multiple shared access are granted to the same user.

bzr revid: odo@openerp.com-20110505162701-eq02jb3c0942x3bt
---
 addons/share/wizard/share_wizard.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 364e4127b93..c22be871b60 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -31,6 +31,9 @@ from tools.safe_eval import safe_eval
 FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink')
 READ_ONLY_ACCESS = ('perm_read',)
 
+# Pseudo-domain to represent an empty filter, constructed using
+# osv.expression's DUMMY_LEAF
+DOMAIN_ALL = [(1, '=', 1)]
 
 RANDOM_PASS_CHARACTERS = [chr(x) for x in range(48, 58) + range(97, 123) + range(65, 91)]
 RANDOM_PASS_CHARACTERS.remove('l') #lowercase l, easily mistaken as one or capital i
@@ -427,11 +430,12 @@ class share_create(osv.osv_memory):
         #     to uid, and it must be replaced correctly)
         rule_obj = self.pool.get('ir.rule')
         # A.
+        main_domain = wizard_data.domain if wizard_data.domain != '[]' else DOMAIN_ALL
         rule_obj.create(cr, 1, {
             'name': _('Sharing filter created by user %s (%s) for group %s') % \
                         (current_user.name, current_user.login, group_id),
             'model_id': model.id,
-            'domain_force': wizard_data.domain,
+            'domain_force': main_domain,
             'groups': [(4,group_id)]
             })
         # B.

From 7928a00024def2ff1f31ef4c1c7544b6e473477d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 5 May 2011 18:55:30 +0200
Subject: [PATCH 8/8] [FIX] share: form view should share current record only

Version bumped to force web addons updates

bzr revid: odo@openerp.com-20110505165530-jnfglbocvzku6rkb
---
 addons/share/__openerp__.py | 2 +-
 addons/share/web/editors.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 9b1b331abb2..9a71412523a 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -22,7 +22,7 @@
 
 {
     "name" : "Sharing Tools",
-    "version" : "1.3.1",
+    "version" : "1.3.2",
     "depends" : ["base"],
     "author" : "OpenERP SA",
     "category": 'Generic Modules',
diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py
index 1928b644073..1e1573b05af 100644
--- a/addons/share/web/editors.py
+++ b/addons/share/web/editors.py
@@ -33,7 +33,9 @@ class ShareActionEditor(openobject.templating.TemplateEditor):
                                            domain: jQuery("#_terp_domain").val(),
                                            view_id: jQuery("#_terp_view_id").val(),
                                            action_id: jQuery("#_terp_action_id").val(),
-                                           search_domain: jQuery("#_terp_search_domain").val(),
+                                           search_domain: jQuery("#_terp_view_type").val() == "form" ? 
+                                                                  ("[('id','=',"+jQuery("#_terp_id").val()+")]") : 
+                                                                     jQuery("#_terp_search_domain").val(),
                                    }));
                                });
                            });