[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x

3 files changed, 233 insertions, 50 deletions

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7df6cdbef0d..62e9241cf4f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -2,10 +2,10 @@ openerp.mail = function (session) {
     var _t = session.web._t,
        _lt = session.web._lt;
 
-    var mail = session.mail = {};
+    var mail = session.mail;
 
-    openerp_mail_followers(session, mail);        // import mail_followers.js
-    openerp_FieldMany2ManyTagsEmail(session);      // import manyy2many_tags_email.js
+    openerp_mail_followers(session, mail);          // import mail_followers.js
+    openerp_FieldMany2ManyTagsEmail(session);       // import manyy2many_tags_email.js
 
     /**
      * ------------------------------------------------------------
@@ -225,6 +225,7 @@ openerp.mail = function (session) {
             this.name = datasets.name ||  false,
             this.record_name = datasets.record_name ||  false,
             this.body = datasets.body || '',
+            this.body_short = datasets.body_short || '',
             this.vote_nb = datasets.vote_nb || 0,
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,
@@ -237,8 +238,15 @@ openerp.mail = function (session) {
 
             this.format_data();
 
+            // update record_name: Partner profile
+            if (this.model == 'res.partner') {
+                this.record_name = 'Partner Profile of ' + this.record_name;
+            }
+            else if (this.model == 'hr.employee') {
+                this.record_name = 'News from ' + this.record_name;
+            }
             // record options and data
-            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level && this.model != 'res.partner';
+            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level;
             this.options.show_read = false;
             this.options.show_unread = false;
             if (this.options.show_read_unread_button) {
@@ -257,8 +265,10 @@ openerp.mail = function (session) {
 
         /* Convert date, timerelative and avatar in displayable data. */
         format_data: function () {
+
             //formating and add some fields for render
             this.date = this.date ? session.web.str_to_datetime(this.date) : false;
+            this.display_date = this.date.toString('ddd MMM dd yyyy HH:mm');
             if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
                 this.timerelative = $.timeago(this.date);
             }
@@ -623,10 +633,7 @@ openerp.mail = function (session) {
             // have unknown names -> call message_get_partner_info_from_emails to try to find partner_id
             var find_done = $.Deferred();
             if (names_to_find.length > 0) {
-                var values = {
-                    'res_id': this.context.default_res_id,
-                }
-                find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [names_to_find], values);
+                find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [this.context.default_res_id, names_to_find]);
             }
             else {
                 find_done.resolve([]);
@@ -672,11 +679,7 @@ openerp.mail = function (session) {
                     var new_names_to_find = _.difference(names_to_find, names_to_remove);
                     find_done = $.Deferred();
                     if (new_names_to_find.length > 0) {
-                        var values = {
-                            'link_mail': true,
-                            'res_id': self.context.default_res_id,
-                        }
-                        find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [new_names_to_find], values);
+                        find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [self.context.default_res_id, new_names_to_find, true]);
                     }
                     else {
                         find_done.resolve([]);
@@ -745,7 +748,7 @@ openerp.mail = function (session) {
                 }
                 // create object and attach to the thread object
                 thread.message_fetch([["id", "=", message_id]], false, [message_id], function (arg, data) {
-                    var message = thread.create_message_object( data[0] );
+                    var message = thread.create_message_object( data.slice(-1)[0] );
                     // insert the message on dom
                     thread.insert_message( message, root ? undefined : self.$el, root );
                 });
@@ -942,7 +945,6 @@ openerp.mail = function (session) {
         
         start: function () {
             this._super.apply(this, arguments);
-            this.expender();
             this.bind_events();
             if(this.thread_level < this.options.display_indented_thread) {
                 this.create_thread();
@@ -965,6 +967,26 @@ openerp.mail = function (session) {
             this.$('.oe_reply').on('click', this.on_message_reply);
             this.$('.oe_star').on('click', this.on_star);
             this.$('.oe_msg_vote').on('click', this.on_vote);
+            this.$('.oe_mail_expand').on('click', this.on_expand);
+            this.$('.oe_mail_reduce').on('click', this.on_expand);
+            this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
+        },
+
+        on_record_clicked: function  (event) {
+            event.stopPropagation();
+            var state = {
+                'model': this.model,
+                'id': this.res_id,
+                'title': this.record_name
+            };
+            session.webclient.action_manager.do_push_state(state);
+            this.do_action({
+                res_model: state.model,
+                res_id: state.id,
+                type: 'ir.actions.act_window',
+                views: [[false, 'form']]
+            });
+            return false;
         },
 
         /* Call the on_compose_message on the thread of this message. */
@@ -975,15 +997,11 @@ openerp.mail = function (session) {
             return false;
         },
 
-        expender: function () {
-            this.$('.oe_msg_body:first').expander({
-                slicePoint: this.options.truncate_limit,
-                expandText: 'read more',
-                userCollapseText: 'read less',
-                detailClass: 'oe_msg_tail',
-                moreClass: 'oe_mail_expand',
-                lessClass: 'oe_mail_reduce',
-                });
+        on_expand: function (event) {
+            event.stopPropagation();
+            this.$('.oe_msg_body_short:first').toggle();
+            this.$('.oe_msg_body_long:first').toggle();
+            return false;
         },
 
         /**
@@ -1842,6 +1860,19 @@ openerp.mail = function (session) {
 
     /**
      * ------------------------------------------------------------
+     * Aside Widget
+     * ------------------------------------------------------------
+     * 
+     * This widget handles the display of a sidebar on the Wall. Its main use
+     * is to display group and employees suggestion (if hr is installed).
+     */
+    mail.WallSidebar = session.web.Widget.extend({
+        template: 'mail.wall.sidebar',
+    });
+
+
+    /**
+     * ------------------------------------------------------------
      * Wall Widget
      * ------------------------------------------------------------
      *
@@ -1901,6 +1932,9 @@ openerp.mail = function (session) {
             if (! this.searchview.has_defaults) {
                 this.message_render();
             }
+            // render sidebar
+            var wall_sidebar = new mail.WallSidebar(this);
+            wall_sidebar.appendTo(this.$el.find('.oe_mail_wall_aside'));
         },
 
         /**
@@ -2018,4 +2052,16 @@ openerp.mail = function (session) {
             });
         },
     });
+
+
+    /**
+     * ------------------------------------------------------------
+     * Sub-widgets loading
+     * ------------------------------------------------------------
+     * 
+     * Load here widgets that could depend on widgets defined in mail.js
+     */
+
+    openerp.mail.suggestions(session, mail);        // import suggestion.js (suggestion widget)
+
 };
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index f812844194b..a0dad1fcdbc 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -29,7 +29,6 @@ openerp_mail_followers = function(session, mail) {
             this.displayed_limit = this.node.attrs.displayed_nb || 10;
             this.displayed_nb = this.displayed_limit;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
-            this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
 
             this.value = [];
@@ -74,10 +73,33 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription);
             // event: click on 'invite' button, that opens the invite wizard
             this.$('.oe_invite').on('click', self.on_invite_follower);
+            // event: click on 'edit_subtype(pencil)' button to edit subscription
+            this.$el.on('click', '.oe_edit_subtype', self.on_edit_subtype);
             this.$el.on('click', '.oe_remove_follower', self.on_remove_follower);
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
         },
 
+        on_edit_subtype: function(event) {
+            var self = this;
+            var $currentTarget = $(event.currentTarget);
+            var user_pid = $currentTarget.data('id');
+            $('div.oe_edit_actions').remove();
+            self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
+                            modal: true,
+                            width: 'auto',
+                            height: 'auto',
+                            title: _t('Edit Subscription of ') + $currentTarget.siblings('a').text(),
+                            buttons: [
+                                    { text: _t("Apply"), click: function() { 
+                                        self.do_update_subscription(event, user_pid);
+                                        $(this).dialog("close");
+                                    }},
+                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                ],
+                    });
+            return self.fetch_subtypes(user_pid);
+        },
+
         on_invite_follower: function (event) {
             var self = this;
             var action = {
@@ -130,7 +152,7 @@ openerp_mail_followers = function(session, mail) {
 
         fetch_followers: function (value_) {
             this.value = value_ || {};
-            return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
+            return this.ds_model.call('read_followers_data', [this.value])
                 .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
                 .then(this.proxy('display_buttons'))
                 .then(this.proxy('fetch_subtypes'));
@@ -147,6 +169,7 @@ openerp_mail_followers = function(session, mail) {
                 self.message_is_follower = (_.indexOf(self.value, pid) != -1);
             }).then(self.proxy('display_generic'));
         },
+
         _format_followers: function(count){
             var str = '';
             if(count <= 0){
@@ -158,6 +181,7 @@ openerp_mail_followers = function(session, mail) {
             }
             return str;
         },
+
         /* Display generic info about follower, for people not having access to res_partner */
         display_generic: function () {
             var self = this;
@@ -168,16 +192,32 @@ openerp_mail_followers = function(session, mail) {
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
+            this.message_is_follower = false;
             this.followers = records || this.followers;
-            this.message_is_follower = this.set_is_follower(this.followers);
             // 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);
+                partner = {
+                    'id': record[0],
+                    'name': record[1],
+                    'is_uid': record[2]['is_uid'],
+                    'is_editable': record[2]['is_editable'],
+                    'avatar_url': mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]),
+                }
+                if (partner.is_uid) {
+                    self.message_is_follower = partner.is_uid;
+                }
+                $(session.web.qweb.render('mail.followers.partner', {'record': partner, 'widget': self})).appendTo(node_user_list);
+                // On mouse-enter it will show the edit_subtype pencil.
+                if (partner.is_editable) {
+                    self.$('.oe_follower_list').on('mouseenter mouseleave', function(e) {
+                        self.$('.oe_edit_subtype').toggleClass('oe_hidden', e.type == 'mouseleave');
+                        self.$('.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
+                    });
+                }
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
@@ -185,12 +225,6 @@ openerp_mail_followers = function(session, mail) {
             }
         },
 
-        /** Computes whether the current user is in the followers */
-        set_is_follower: function (records) {
-            var user_ids = _.pluck(_.pluck(records, 'user_ids'), 0);
-            return _.indexOf(user_ids, this.session.uid) != -1;
-        },
-
         display_buttons: function () {
             if (this.message_is_follower) {
                 this.$('button.oe_follower').removeClass('oe_notfollow').addClass('oe_following');
@@ -206,25 +240,37 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function () {
+        fetch_subtypes: function (user_pid) {
             var self = this;
-            var subtype_list_ul = this.$('.oe_subtype_list').empty();
-            if (! this.message_is_follower) return;
+            var dialog = false;
+            if (user_pid) {
+                dialog = true;
+            } else {
+                var subtype_list_ul = this.$('.oe_subtype_list').empty();
+                if (! this.message_is_follower) return;
+            }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id], new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {self.display_subtypes(data, id);});
+            this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})])
+                .then(function (data) {self.display_subtypes(data, id, dialog);});
         },
 
         /** Display subtypes: {'name': default, followed} */
-        display_subtypes:function (data, id) {
+        display_subtypes:function (data, id, dialog) {
             var self = this;
-            var $list = this.$('.oe_subtype_list');
+            if (dialog) {
+                var $list = self.$dialog;
+            }
+            else {
+                var $list = this.$('.oe_subtype_list');
+            }
             $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
+            this.records_length = $.map(records, function(value, index) { return index; }).length;
+            if (this.records_length > 1) { self.display_followers(); }
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list);
             });
             if (_.size(records) > 1) {
                 $list.show();
@@ -241,35 +287,49 @@ openerp_mail_followers = function(session, mail) {
             });
         },
         
-        do_unfollow: function () {
+        do_unfollow: function (user_pid) {
             if (confirm(_t("Warning! \nYou won't be notified of any email or discussion on this document. Do you really want to unfollow this document ?"))) {
                 _(this.$('.oe_msg_subtype_check')).each(function (record) {
                     $(record).attr('checked',false);
                 });
+            var action_unsubscribe = 'message_unsubscribe_users';
+            var follower_ids = [this.session.uid];
+            if (user_pid) {
+                action_unsubscribe = 'message_unsubscribe';
+                follower_ids = [user_pid];
+            }
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context])
-                    .then(this.proxy('read_value'));
+                return this.ds_model.call(action_unsubscribe, [[this.view.datarecord.id], follower_ids, context])
+                     .then(this.proxy('read_value'));
             }
             return false;
         },
 
-        do_update_subscription: function (event) {
+        do_update_subscription: function (event, user_pid) {
             var self = this;
 
+            var action_subscribe = 'message_subscribe_users';
+            var follower_ids = [this.session.uid];
+            var oe_action = this.$('.oe_actions input[type="checkbox"]');
+            if (user_pid) {
+                action_subscribe = 'message_subscribe';
+                follower_ids = [user_pid];
+                oe_action = $('.oe_edit_actions input[type="checkbox"]');
+            }
             var checklist = new Array();
-            _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
+            _(oe_action).each(function (record) {
                 if ($(record).is(':checked')) {
                     checklist.push(parseInt($(record).data('id')));
                 }
             });
 
             if (!checklist.length) {
-                if (!this.do_unfollow()) {
+                if (!this.do_unfollow(user_pid)) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, context])
+                return this.ds_model.call(action_subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
new file mode 100644
index 00000000000..4d0fcec32bf
--- /dev/null
+++ b/addons/mail/static/src/js/suggestions.js
@@ -0,0 +1,77 @@
+openerp.mail.suggestions = function(session, mail) {
+    var _t = session.web._t;
+    var QWeb = session.web.qweb;
+
+    var suggestions = session.suggestions = {};
+    var removed_suggested_group = session.suggestions.removed_suggested_group = [];
+
+    suggestions.Groups = session.web.Widget.extend({
+        events: {
+            'click .oe_suggestion_remove.oe_suggestion_group': 'stop_group_suggestion',
+            'click .oe_suggestion_remove_item.oe_suggestion_group': 'remove_group_suggestion',
+            'click .oe_suggestion_join': 'join_group',
+        },
+
+        init: function () {
+            this._super.apply(this, arguments);
+            this.mail_group = new session.web.DataSetSearch(this, 'mail.group');
+            this.res_users = new session.web.DataSetSearch(this, 'res.users');
+            this.groups = [];
+        },
+
+        start: function () {
+            this._super.apply(this, arguments);
+            return this.fetch_suggested_groups();
+        },
+
+        fetch_suggested_groups: function () {
+            var self = this;
+            var group = self.mail_group.call('get_suggested_thread', {'removed_suggested_threads': removed_suggested_group}).then(function (res) {
+                _(res).each(function (result) {
+                    result['image']=self.session.url('/web/binary/image', {model: 'mail.group', field: 'image_small', id: result.id});
+                });
+                self.groups = res;
+            });
+            return $.when(group).then(this.proxy('display_suggested_groups'));
+        },
+
+        display_suggested_groups: function () {
+            var suggested_groups = this.$('.oe_sidebar_suggestion.oe_suggestion_group');
+            if (suggested_groups) {
+                suggested_groups.empty();
+            }
+            if (this.groups.length === 0) {
+                return this.$el.empty();
+            }
+            return this.$el.empty().html(QWeb.render('mail.suggestions.groups', {'widget': this}));
+        },
+
+        join_group: function (event) {
+            var self = this;
+            return this.mail_group.call('message_subscribe_users', [[$(event.currentTarget).attr('id')],[this.session.uid]]).then(function(res) {
+                self.fetch_suggested_groups();
+            });
+        },
+
+        remove_group_suggestion: function (event) {
+            removed_suggested_group.push($(event.currentTarget).attr('id'));
+            return this.fetch_suggested_groups();
+        },
+
+        stop_group_suggestion: function (event) {
+            var self = this;
+            return this.res_users.call('stop_showing_groups_suggestions', [this.session.uid]).then(function(res) {
+                self.$(".oe_sidebar_suggestion.oe_suggestion_group").hide();
+            });
+        }
+    });
+
+    session.mail.WallSidebar.include({
+        start: function () {
+            this._super.apply(this, arguments);
+            var sug_groups = new suggestions.Groups(this);
+            return sug_groups.appendTo(this.$('.oe_suggestions_groups'));
+        },
+    });
+
+};