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

[IMP] mail: oppenchatter hidden attachment

Browse Source 
bzr revid: chm@openerp.com-20121025080529-p2dw63h2u2ixyt26
This commit is contained in:
Christophe Matthieu
2012-10-25 10:05:29 +02:00
parent 4818ad676f
commit 3e4d6ad440
3 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/css/mail.css
+3 -1
View File
@@ -158,9 +158,11 @@
padding-top: 2px;
padding-bottom:6px;
}
.openerp .oe_mail .oe_msg_attachments.oe_hidden{
.openerp .oe_mail .oe_msg_attachments.oe_hidden,
.openerp .oe_mail .oe_msg_images.oe_hidden{
margin:0px;
border: none;
display: none;
}
.openerp .oe_mail .oe_msg_attachments{
margin-bottom: 4px;
addons/mail/static/src/js/mail.js
+18 -17
View File
@@ -372,8 +372,9 @@ openerp.mail = function(session) {
'mail.mt_comment',
this.context.default_parent_id,
attachments,
// (this.options.display_indented_thread - this.thread_level),
this.parent_thread.context
]).then(function(records){
]).then(function(records) {
self.parent_thread.switch_new_message(records);
self.on_cancel();
//session.web.unblockUI();
@@ -407,7 +408,7 @@ openerp.mail = function(session) {
if(this.$render_expandable.is(':hidden')){
this.$render_expandable.show();
this.$render_expandable.css('display', '');
this.$render_compact.hide();
this.$render_expandable.find('textarea').focus();
@@ -417,7 +418,7 @@ openerp.mail = function(session) {
if(!this.$render_expandable.find('textarea').val().match(/\S+/)){
this.$render_expandable.hide();
if(this.options.show_compact_message && this.show_compact_message) {
this.$render_compact.show();
this.$render_compact.css('display', '');
} else {
this.$render_compact.hide();
}
@@ -434,7 +435,7 @@ openerp.mail = function(session) {
do_show_compact: function() {
if(this.options.show_compact_message && (!this.$render_expandable || this.$render_expandable.is(':hidden'))) {
this.$render_compact.show();
this.$render_compact.css('display', '');
}
this.show_compact_message = true;
}
@@ -642,33 +643,29 @@ openerp.mail = function(session) {
attach.is_image = true;
attach['url'] = mail.ChatterUtils.get_image(this.session, 'ir.attachment', 'datas', attach.id);
}
//To do
// if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) {
// attach.is_document = true;
// attach.url_escape = encodeURIComponent(attach.url);
// }
}
},
start: function() {
this._super.apply(this, arguments);
this.expender();
this.$el.hide().fadeIn(750);
this.$el.hide().fadeIn(750, function() {$(this).css('display', '');});
this.resize_img();
this.bind_events();
this.create_thread();
this.$('.oe_msg_attachments, .oe_msg_images').addClass("oe_hidden");
},
resize_img: function() {
this.$("img").load(function() {
var resize = function() {
var h = $(this).height();
var w = $(this).width();
if( h > 100 || w >100 ) {
var ratio = 100 / (h > w ? h : w);
$(this).attr("width", parseInt( w*ratio )).attr("height", parseInt( h*ratio ));
}
});
};
this.$("img").load(resize).each(resize);
},
/**
@@ -678,8 +675,14 @@ openerp.mail = function(session) {
var self = this;
// event: click on 'Attachment(s)' in msg
this.$('a.oe_msg_view_attachments:first').on('click', function (event) {
self.$('.oe_msg_attachments:first').toggle();
this.$('.oe_mail_msg_view_attachments').on('click', function (event) {
var attach = self.$('.oe_msg_attachments:first, .oe_msg_images:first');
if( self.$('.oe_msg_attachments:first').hasClass("oe_hidden") ) {
attach.removeClass("oe_hidden");
} else {
attach.addClass("oe_hidden");
}
self.resize_img();
});
// event: click on icone 'Read' in header
this.$el.on('click', '.oe_read', this.on_message_read_unread);
@@ -1584,8 +1587,6 @@ openerp.mail = function(session) {
* @param {Array} [options.domain] domain on the Wall
* @param {Object} [options.context] context, is an object. It should
* contain default_model, default_res_id, to give it to the threads.
* @param {Number} [options.thread_level] number of thread levels to display
* 0 being flat.
*/
init: function (parent, options) {
this._super(parent);
addons/mail/static/src/xml/mail.xml
+3 -11
View File
@@ -70,8 +70,8 @@
Template used to display attachments in a mail.message
-->
<t t-name="mail.thread.message.attachments">
<span t-attf-class="oe_msg_attachments">
<t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image and !attachment.is_document">
<span class="oe_msg_attachments">
<t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
<div class="oe_attachment">
<span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
<div class="oe_upload_in_process">
@@ -90,21 +90,13 @@
</div>
</t>
</span>
<span t-attf-class="oe_msg_images">
<span class="oe_msg_images">
<t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_image">
<a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
<img t-if="attachment.is_image" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-att-src="attachment.url"/>
</a>
</t>
</span>
<span t-attf-class="oe_msg_document">
<t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_document">
<a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
<t t-raw="attachment.name || attachment.filename"/>
</a>
<iframe t-attf-src="http://docs.google.com/viewer?url=#{ attachment.url_escape }&amp;embedded=true" width="600" height="400" style="border: none;"></iframe>
</t>
</span>
</t>
<t t-name="mail.thread.message.private">