pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Slighty improved wall widget.

Browse Source 
bzr revid: tde@openerp.com-20120221153942-mue1h18f2fjluf27
This commit is contained in:
Thibault Delavallée
2012-02-21 16:39:42 +01:00
parent 413df33104
commit 7429f3bfb6
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/css/mail.css
+5
View File
@@ -5,6 +5,11 @@
padding: 5px 5px 5px 5px;
}
.oe_mail_wall_main {
overflow: auto;
padding: 5px 5px 5px 5px;
}
/* 2 columns view */
.oe_mail_main_left {
float: left;
addons/mail/static/src/js/mail.js
+12 -15
View File
@@ -34,7 +34,6 @@ openerp.mail = function(session) {
},
stop: function () {
console.log('stop');
this._super.apply(this, arguments);
},
@@ -134,39 +133,37 @@ openerp.mail = function(session) {
start: function() {
var self = this;
this._super.apply(this, arguments);
console.log(this);
self.$element.find('button.oe_mail_action_comment').bind('click', function () { self.do_comment(); });
this.ds_msg.call('get_pushed_messages', [[], self.filter_search]).then(
this.proxy('display_records'));
self.$element.find('button.oe_mail_button_comment').bind('click', function () { self.do_comment(); });
return this.fetch_comments();
},
stop: function () {
this._super();
},
fetch_messages: function () {
console.log('debug--fetch_messages');
return this.ds_msg.call('get_pushed_messages', []).then(
this.proxy('display_records'));
fetch_comments: function () {
var load_res = this.ds_msg.call('get_pushed_messages', [[this.session.uid]]).then(
this.proxy('display_comments'));
return load_res;
},
display_records: function (records) {
this.$element.find('div.oe_mail_comments').empty();
display_comments: function (records) {
this.$element.find('div.oe_mail_msg').empty();
var self = this;
_(records).each(function (record) {
console.log(record);
var template = 'ThreadMsgView';
var render_res = session.web.qweb.render(template, {
'record': record,
});
$('<div class="oe_mail_msg">').html(render_res).appendTo(self.$element.find('div.oe_mail_comments'));
$('<div class="oe_mail_comment">').html(render_res).appendTo(self.$element.find('div.oe_mail_msg'));
});
// this.timeout = setTimeout(this.proxy('fetch_messages'), 5000);
},
do_comment: function () {
var body_text = this.$element.find('textarea').val();
return this.ds.call('message_append_note', [[this.view.datarecord.id], 'Reply comment', body_text, type='comment']).then(
this.proxy('fetch_messages'));
return this.ds_msg.call('create', [{'subject': 'Status tweet', 'model': 'res.users', 'body_text': body_text, 'type': 'comment'}]).then(
this.proxy('fetch_comments'));
},
});
};
addons/mail/static/src/xml/mail.xml
+6 -4
View File
@@ -47,12 +47,14 @@
</div>
</t>
<div t-name="WallView" class="oe_mail_wall">
<div t-name="WallView" class="oe_mail_wall_main">
<div class="oe_mail_post_comment">
<textarea rows="3" cols="15">Type your comment</textarea><br />
<button type="button" class="oe_mail_action_comment">Post comment</button>
<textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
<button type="button" class="oe_mail_button_comment">Post comment</button>
</div>
<div class="oe_mail_comments">
<div class="oe_mail_msg">
<div class="oe_mail_comment">
</div>
</div>
</div>