From 1b58af40cc5affbdde948ed323ba4d3e626c9d6d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 16 Aug 2012 09:26:42 +0200 Subject: [PATCH] [IMP] subscriber --> follower bzr revid: fp@tinyerp.com-20120816072642-614ukk9q5zvrdp6i --- addons/mail/mail_thread.py | 24 ++++++++++----------- addons/mail/static/src/js/mail_followers.js | 20 ++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 7d233345315..689bbc2f27f 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -121,7 +121,7 @@ class mail_thread(osv.Model): _description = 'Email Thread' # TODO: may be we should make it _inherit ir.needaction - def _get_is_subscriber(self, cr, uid, ids, name, args, context=None): + def _get_is_follower(self, cr, uid, ids, name, args, context=None): subobj = self.pool.get('mail.subscription') subids = subobj.search(cr, uid, [ ('res_model','=',self._name), @@ -153,8 +153,8 @@ class mail_thread(osv.Model): for thread in self.browse(cr, uid, ids, context=context): message_ids = thread.message_ids - subscriber_ids = thread.message_follower_ids - res[id]['message_summary'] = "9 %d + %d" % (len(message_ids), len(subscriber_ids)), + follower_ids = thread.message_follower_ids + res[id]['message_summary'] = "9 %d + %d" % (len(message_ids), len(follower_ids)), return res # FP Note: todo @@ -229,7 +229,7 @@ class mail_thread(osv.Model): def message_get_automatic_followers(self, cr, uid, id, record_vals, add_uid=True, fetch_missing=False, context=None): """ Return the command for the many2many follower_ids field to manage - subscribers. Behavior : + followers. Behavior : - get the monitored fields (ex: ['user_id', 'responsible_id']); those fields should be relationships to res.users (#TODO: res.partner) - if this field is in the record_vals: it means it has been modified @@ -237,7 +237,7 @@ class mail_thread(osv.Model): - if this fields is not in record_vals, but fetch_missing paramter is set to True: fetch the value in the record (use: at creation for default values, not present in record_vals) - - if add_uid: add the current user (for example: writer is subscriber) + - if add_uid: add the current user (for example: writer is follower) - generate the command and return it This method has to be used on 1 id, because otherwise it would imply to track which user.id is used for which record.id. @@ -965,25 +965,25 @@ class mail_thread(osv.Model): #------------------------------------------------------ # FP Note: replaced by message_follower_ids - # def message_get_subscribers(self, cr, uid, ids, context=None): + # def message_get_followers(self, cr, uid, ids, context=None): - def message_read_subscribers(self, cr, uid, ids, fields=['id', 'name', 'image_small'], context=None): + def message_read_followers(self, cr, uid, ids, fields=['id', 'name', 'image_small'], context=None): """ Returns the current document followers as a read result. Used mainly for Chatter having only one method to call to have details about users. """ - user_ids = self.message_get_subscribers(cr, uid, ids, context=context) + user_ids = self.message_get_followers(cr, uid, ids, context=context) return self.pool.get('res.users').read(cr, uid, user_ids, fields=fields, context=context) - def message_is_subscriber(self, cr, uid, ids, user_id = None, context=None): - """ Check if uid or user_id (if set) is a subscriber to the current + def message_is_follower(self, cr, uid, ids, user_id = None, context=None): + """ Check if uid or user_id (if set) is a follower to the current document. :param user_id: if set, check is done on user_id; if not set check is done on uid """ sub_user_id = uid if user_id is None else user_id - if sub_user_id in self.message_get_subscribers(cr, uid, ids, context=context): + if sub_user_id in self.message_get_followers(cr, uid, ids, context=context): return True return False @@ -1002,7 +1002,7 @@ class mail_thread(osv.Model): subscription_obj = self.pool.get('mail.subscription') create_ids = [] for id in ids: - already_subscribed_user_ids = self.message_get_subscribers(cr, uid, [id], context=context) + already_subscribed_user_ids = self.message_get_followers(cr, uid, [id], context=context) for user_id in to_subscribe_uids: if user_id in already_subscribed_user_ids: continue create_ids.append(subscription_obj.create(cr, uid, {'res_model': self._name, 'res_id': id, 'user_id': user_id}, context=context)) diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js index 0e920f73041..87d68a228a9 100644 --- a/addons/mail/static/src/js/mail_followers.js +++ b/addons/mail/static/src/js/mail_followers.js @@ -76,27 +76,27 @@ openerp_mail_followers = function(session, mail) { this.$element.find('div.oe_mail_recthread_aside').hide(); return; } - return this.fetch_subscribers(value_); + return this.fetch_followers(value_); }, - fetch_subscribers: function (value_) { - return this.ds_follow.call('read', [value_ || this.get_value(), ['name', this.params.image]]).then(this.proxy('display_subscribers')); + fetch_followers: function (value_) { + return this.ds_follow.call('read', [value_ || this.get_value(), ['name', this.params.image]]).then(this.proxy('display_followers')); }, /** * Display the followers. - * TODO: replace the is_subscriber check by fields read */ - display_subscribers: function (records) { + * TODO: replace the is_follower check by fields read */ + display_followers: function (records) { var self = this; - this.is_subscriber = false; + this.is_follower = false; var user_list = this.$element.find('ul.oe_mail_followers_display').empty(); this.$element.find('div.oe_mail_recthread_followers h4').html(this.params.title + ' (' + records.length + ')'); _(records).each(function (record) { - if (record.id == self.session.uid) { self.is_subscriber = true; } + if (record.id == self.session.uid) { self.is_follower = true; } record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.users', 'image_small', record.id); $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(user_list); }); - if (this.is_subscriber) { + if (this.is_follower) { this.$element.find('button.oe_mail_button_follow').hide(); this.$element.find('button.oe_mail_button_unfollow').show(); } else { @@ -113,8 +113,8 @@ openerp_mail_followers = function(session, mail) { }, do_toggle_followers: function () { - this.params.see_subscribers = ! this.params.see_subscribers; - if (this.params.see_subscribers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); } + this.params.see_followers = ! this.params.see_followers; + if (this.params.see_followers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); } else { this.$element.find('button.oe_mail_button_followers').html('Show followers'); } this.$element.find('div.oe_mail_recthread_followers').toggle(); },