').html(render_res).appendTo(self.$element.find('div.oe_mail_thread_display'));
- });
- },
-
do_comment: function () {
var body_text = this.$element.find('textarea').val();
- return this.ds.call('message_append_note', [[this.res_id], 'Reply comment', body_text, type='comment']).then(
- this.proxy('fetch_comments'));
+ return this.ds.call('message_append_note', [[this.params.res_id], 'Reply comment', body_text, type='comment']).then(
+ this.proxy('init_comments'));
},
- /* check for internal links, and map them to limitate number of queries -- WIP, probably not useful */
- check_internal_links: function(string) {
- /* shortcut to user: @login */
- var regex_login = new RegExp(/(^|\s)@(\w*[a-zA-Z_.]+\w*\s)/g);
- var regex_res = regex_login.exec(string);
- while (regex_res != null) {
- var login = regex_res[2];
- this.map_hash['res.users'].push(login);
- regex_res = regex_login.exec(string);
- }
- /* internal links: @res.model,name */
- var regex_intlink = new RegExp(/(^|\s)@(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
- regex_res = regex_intlink.exec(string);
- while (regex_res != null) {
- var res_model = regex_res[2] + '.' + regex_res[3];
- var res_name = regex_res[4];
- if (! (res_model in this.map_hash)) { this.map_hash[res_model] = []; }
- this.map_hash[res_model].push(res_name);
- regex_res = regex_intlink.exec(string);
- }
+ do_more: function () {
+ return this.fetch_comments(this.limit, this.offset);
},
do_replace_internal_links: function (string) {
var self = this;
- /* internal links: @sale.order,32 */
- var regex_intlink = new RegExp(/(^|\s)@(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\d+)/g);
- var regex_res = regex_intlink.exec(string);
- while (regex_res != null) {
- var res_model = regex_res[2] + '.' + regex_res[3];
- var res_id = regex_res[4];
- string = string.replace(regex_res[0], '' + regex_res[1] + ''
- + res_model + '(' + res_id + ')');
- regex_res = regex_intlink.exec(string);
- }
/* shortcut to user: @login */
- //var regex_login = new RegExp(/(^|\s)@(\w*[a-zA-Z_.]+\w*)/g);
- //var regex_res = regex_login.exec(string);
- //while (regex_res != null) {
- //var res_model = regex_res[2] + '.' + regex_res[3];
- //var res_id = regex_res[4];
- //string = string.replace(regex_res[0], '' + regex_res[1] + ''
- //+ res_model + '(' + res_id + ')');
- //regex_res = regex_intlink.exec(string);
- //}
+ var regex_login = new RegExp(/(^|\s)@(\w*)/g);
+ var regex_res = regex_login.exec(string);
+ while (regex_res != null) {
+ var login = regex_res[2];
+ var res_id = 1;
+ //var user_loaded = this.ds_users.call('search', [[['login', 'in', [login]]]]).then(function (records) {
+ //console.log(records);
+ //if (records) string = string.replace(regex_res[0], '@' + login + '');
+ //});
+ //$.when(user_loaded).then(function() {
+ //});
+ regex_res = regex_login.exec(string);
+ }
return string;
},
thread_get_avatar_mini: function(model, field, id) {
- id = id || '';
- var url = this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
- return url;
+ return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
},
+
+ do_truncate_string: function(string, max_length) {
+ if (string.length <= max_length) return false;
+ else return string.slice(0, max_length);
+ },
+
+ do_clean_text: function (string) {
+ var html = $('').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('<(/)?b\\s*>', 'gi'), '<$1b>');
+ return html;
+ },
+
+ /**
+ *
+ * var regex_login = new RegExp(/(^|\s)@(\w*[a-zA-Z_.]+\w*\s)/g);
+ * var regex_login = new RegExp(/(^|\s)@(\w*)/g);
+ * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+ */
+ do_check_internal_links: function(string) {
+ /* shortcut to user: @login */
+ var regex_login = new RegExp(/(^|\s)@(\w*)/g);
+ var regex_res = regex_login.exec(string);
+ while (regex_res != null) {
+ var login = regex_res[2];
+ this.map_hash['res.users']['login'].push(login);
+ regex_res = regex_login.exec(string);
+ }
+ /* internal links: #res.model,name */
+ var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+ regex_res = regex_intlink.exec(string);
+ while (regex_res != null) {
+ var res_model = regex_res[2] + '.' + regex_res[3];
+ var res_name = regex_res[4];
+ if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
+ this.map_hash[res_model]['name'].push(res_name);
+ regex_res = regex_intlink.exec(string);
+ }
+ },
+
});
@@ -251,13 +294,23 @@ openerp.mail = function(session) {
/* WallView widget: a wall of messages */
mail.WallView = session.web.Widget.extend({
- // QWeb template to use when rendering the object
template: 'Wall',
+ /**
+ * @param {Object} parent parent
+ * @param {Object} [params]
+ * @param {Number} [params.limit=20] number of messages to show and fetch
+ * @var {Array} sorted_comments records sorted by res_model and res_id
+ * records.res_model = {res_ids}
+ * records.res_model.res_id = [records]
+ */
init: function (parent, params) {
this._super(parent);
- this.filter_search = params['filter_search'];
- this.search = {}
+ this.params = params || {};
+ this.params.limit = params.limit || 20;
+ this.params.search = {};
+ this.params.domain = [];
+ this.sorted_comments = {};
/* DataSets */
this.ds_msg = new session.web.DataSet(this, 'mail.message');
this.ds_thread = new session.web.DataSet(this, 'mail.thread');
@@ -274,19 +327,33 @@ openerp.mail = function(session) {
self.searchview.on_search.add(self.do_searchview_search);
});
/* fetch comments */
- var comments_ready = this.fetch_comments();
+ var comments_ready = this.init_comments();
return (search_view_ready && comments_ready);
},
stop: function () {
this._super.apply(this, arguments);
},
-
+
+ /**
+ * Loads the mail.message search view
+ * @param {Number} view_id id of the search view to load
+ * @param {??} defaults ??
+ * @param {Boolean} hidden ??
+ */
load_search_view: function (view_id, defaults, hidden) {
this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
return this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
},
-
+
+ /**
+ * Aggregate the domains, contexts and groupbys in parameter
+ * with those from search form, and then calls fetch_comments
+ * to actually fetch comments
+ * @param {Array} domains
+ * @param {Array} contexts
+ * @param {Array} groupbys
+ */
do_searchview_search: function(domains, contexts, groupbys) {
var self = this;
this.rpc('/web/session/eval_domain_and_context', {
@@ -294,25 +361,51 @@ openerp.mail = function(session) {
contexts: contexts || [],
group_by_seq: groupbys || []
}, function (results) {
- self.search['context'] = results.context;
- self.search['domain'] = results.domain;
- self.search['groupby'] = results.group_by;
- self.fetch_comments(self.search['domain'], self.search['context']);
+ self.params.search['context'] = results.context;
+ self.params.search['domain'] = results.domain;
+ self.params.search['groupby'] = results.group_by;
+ self.init_comments(self.params.search['domain'], self.params.search['context']);
});
},
-
+
+ /**
+ * Initializes Wall and calls fetch_comments
+ * @param {Array} domains
+ * @param {Array} contexts
+ * @param {Array} groupbys
+ * @param {Number} limit number of messages to fetch
+ */
+ init_comments: function(domain, context, offset, limit) {
+ var self = this;
+ this.params.domain = [];
+ this.sorted_comments = {};
+ this.$element.find('div.oe_mail_wall_threads').empty();
+ return this.fetch_comments(domain, context, offset, limit).then(function () {
+ self.$element.find('button.oe_mail_wall_button_more').bind('click', function () { self.do_more(); });
+ });
+ },
+
+ /**
+ * Fetches Wall comments (mail.thread.get_pushed_messages)
+ * @param {Array} domains
+ * @param {Array} contexts
+ * @param {Array} groupbys
+ * @param {Number} limit number of messages to fetch
+ */
fetch_comments: function (domain, context, offset, limit) {
var load_res = this.ds_thread.call('get_pushed_messages',
[[this.session.uid], limit = (limit || 100), offset = (offset || 0), domain = (domain || null), context = (context || null) ]).then(
this.proxy('display_comments'));
return load_res;
},
-
+
+ /**
+ * @param {Array} records records to show in threads
+ */
display_comments: function (records) {
- this.$element.find('div.oe_mail_wall_threads').empty();
- sorted_records = this.sort_comments(records);
+ var sorted_comments = this.sort_comments(records, this.sorted_comments);
var self = this;
- _(sorted_records).each(function (rec_models, model) { // each model
+ _(sorted_comments).each(function (rec_models, model) { // each model
_(rec_models).each(function (record_id, id) { // each record
var template = 'WallThreadContainer';
var render_res = session.web.qweb.render(template, {
@@ -320,16 +413,24 @@ openerp.mail = function(session) {
'record_id': id,
});
$('
+
').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
- self.thread_display = new mail.ThreadDisplay(self,
+ var thread_display = new mail.ThreadDisplay(self,
{'res_model': model, 'res_id': parseInt(id), 'uid': self.session.uid, 'records': record_id}
);
- self.thread_display.appendTo(self.$element.find('div.oe_mail_wall_thread_content:last'));
+ thread_display.appendTo(self.$element.find('div.oe_mail_wall_thread_content:last'));
});
});
+ $.extend(true, this.sorted_comments, sorted_comments);
},
+ /**
+ * Add records to sorted_comments array
+ * @param {Array} records records from mail.message
+ * @returns {Object} sorted_comments: dict
+ * sorted_comments.res_model = {res_ids}
+ * sorted_comments.res_model.res_id = [records]
+ */
sort_comments: function (records) {
- sorted_comments = {};
+ sorted_comments = {}
_(records).each(function (record) {
if (! (record.model in sorted_comments)) { sorted_comments[record.model] = {}; }
if (! (record.res_id in sorted_comments[record.model])) {
@@ -339,12 +440,45 @@ openerp.mail = function(session) {
return sorted_comments;
},
+ /**
+ * Create a domain to fetch new comments according to
+ * comment already present in sorted_comments
+ * @param {Object} sorted_comments (see sort_comments)
+ * @returns {Array} fetch_domain (OpenERP domain style)
+ */
+ get_fetch_domain: function (sorted_comments) {
+ var domain = [];
+ _(sorted_comments).each(function (rec_models, model) { //each model
+ var ids = [];
+ _(rec_models).each(function (record_id, id) { // each record
+ ids.push(id);
+ });
+ domain.push('|', ['model', '!=', model], ['res_id', 'not in', ids]);
+ });
+ return domain;
+ },
+
+ /**
+ * Action: Posts a comment
+ */
do_comment: function () {
var body_text = this.$element.find('textarea').val();
return this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, type='comment']).then(
- this.proxy('fetch_comments'));
+ //this.proxy('fetch_comments'));
+ this.init_comments());
},
+ /**
+ * Action: Shows more discussions
+ */
+ do_more: function () {
+ var domain = this.get_fetch_domain(this.sorted_comments);
+ return this.fetch_comments(domain);
+ },
+
+ /**
+ * Tools: get avatar mini (TODO: should be moved in some tools ?)
+ */
thread_get_mini: function(model, field, id) {
id = id || '';
var url = this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 393ab9d49b3..b2cc1e8e0c7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -13,6 +13,11 @@
+
+
@@ -57,44 +62,67 @@
-
- +
+
- +
+
+
+
+
- Discussion about document
-
+
+
+
+
+
+
+ From:
+ To:
+
+
+