diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-04-24 14:59:25 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-04-24 14:59:25 +0530 |
| commit | dfc4e3fb0979d76e47376680fbefc2a33e38bcd3 (patch) | |
| tree | 148f0e02cda3f890f40f0003d92334a44752e867 /addons/share | |
| parent | c6bcc6d69fd7a1f8de0ad93baa642d5801b96a32 (diff) | |
| parent | e9f015e217f1ff48d95e9b55a9515b7276240c48 (diff) | |
[MERGE]
bzr revid: apa@tinyerp.com-20120417112722-7rz5vvcg6eo0jf3e
bzr revid: apa@tinyerp.com-20120419051214-j4wvjp9kz1w0zqs7
bzr revid: apa@tinyerp.com-20120423053400-unc6y6lonksopys3
bzr revid: apa@tinyerp.com-20120424092925-ezqfnppvfgocj94t
Diffstat (limited to 'addons/share')
| -rw-r--r-- | addons/share/static/src/css/share.css | 1 | ||||
| -rw-r--r-- | addons/share/static/src/xml/share.xml | 4 | ||||
| -rw-r--r-- | addons/share/wizard/share_wizard.py | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css index 379b3fbb86b..2cab9c6d2f2 100644 --- a/addons/share/static/src/css/share.css +++ b/addons/share/static/src/css/share.css @@ -1,5 +1,4 @@ button.oe-share-mail { - width: 120px; display: none; } diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml index d79c2d8501e..df9cb165c36 100644 --- a/addons/share/static/src/xml/share.xml +++ b/addons/share/static/src/xml/share.xml @@ -11,8 +11,8 @@ </t> <t t-extend="RecordThread"> - <t t-jquery=".oe_mail_button_follow" t-operation="before"> - <button type="button" class="oe-share-mail">Invite</button> + <t t-jquery="button.oe_mail_button_unfollow" t-operation="after"> + <button type="button" class="oe-share-mail oe_mail_button_mouseout">Invite</button> </t> </t> diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 854f021bf67..07004f333a8 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -189,7 +189,7 @@ class share_wizard(osv.osv_memory): 'invite': False, 'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'), 'action_id': lambda self, cr, uid, context, *a: context.get('action_id'), - 'access_mode': 'readonly', + 'access_mode': 'readwrite', 'embed_option_title': True, 'embed_option_search': True, } @@ -502,6 +502,8 @@ class share_wizard(osv.osv_memory): # Create required rights if allowed by current user rights and not # already granted for dummy, model in fields_relations: + # mail.message is transversal: it should not received directly the access rights + if model.model in ['mail.message']: continue values = { 'name': _('Copied access for sharing'), 'group_id': group_id, @@ -632,6 +634,8 @@ class share_wizard(osv.osv_memory): domain = safe_eval(wizard_data.domain) if domain: for rel_field, model in fields_relations: + # mail.message is transversal: it should not received directly the access rights + if model.model in ['mail.message']: continue related_domain = [] if not rel_field: continue for element in domain: |