diff options
| author | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-04-11 18:05:37 +0530 |
|---|---|---|
| committer | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-04-11 18:05:37 +0530 |
| commit | 5bbffbc39c899adb92d251a3c8ef7f06e39338a7 (patch) | |
| tree | aef9a405359c8b4a6330d54bc5b1bd88c01e09cc | |
| parent | 7df8cdd0d69bf0a147c69278b3992e4d392d9901 (diff) | |
[IMP] Improved code and made the EDIT followers visible when 'Technical Features' are given and it is in 'DEBUG mode'.
bzr revid: psa@tinyerp.com-20130411123537-2wzb468o7o0dno8c
| -rw-r--r-- | addons/mail/mail_thread.py | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail_followers.js | 8 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail_followers.xml | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 603c77f6ede..879f991ddb3 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -152,6 +152,13 @@ class mail_thread(osv.AbstractModel): res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New")) return res + def check_access_right(self, cr, uid, ids, context=None): + grp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one') + user_pid = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users'] + if uid in user_pid: + return True + return False + def _get_subscription_data(self, cr, uid, ids, name, args, user_id=None, context=None): """ Computes: - message_subtype_data: data about document subtypes: which are diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js index 93f8f995ec7..09f54f012ce 100644 --- a/addons/mail/static/src/js/mail_followers.js +++ b/addons/mail/static/src/js/mail_followers.js @@ -192,14 +192,18 @@ openerp_mail_followers = function(session, mail) { var self = this; this.followers = records || this.followers; this.message_is_follower = this.set_is_follower(this.followers); + this.check_access = false; // clean and display title var node_user_list = this.$('.oe_follower_list').empty(); this.$('.oe_follower_title').html(this._format_followers(this.followers.length)); // truncate number of displayed followers var truncated = this.followers.slice(0, this.displayed_nb); _(truncated).each(function (record) { - record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id); - $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list); + self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){ + self.check_access = result; + record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id); + $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list); + }) }); // FVA note: be sure it is correctly translated if (truncated.length < this.followers.length) { diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 88f38146de3..ca0064cbc78 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -31,7 +31,7 @@ <div t-name="mail.followers.partner" class='oe_partner'> <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/> <a t-attf-href="#model=res.partner&id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a> - <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/> + <img t-if="widget.session.debug and widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/> <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span> </div> |
