odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] remove manual subscription and better css 

bzr revid: mat@openerp.com-20130417080714-8taku42rc1eanz1q
This commit is contained in:
Martin Trigaux 2013-04-17 10:07:14 +02:00
parent 56a5a3280f
commit cbeb793c57
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hr/hr.py
View File

@ -228,9 +228,6 @@ class hr_employee(osv.osv):
except:
pass # group deleted: do not push a message
# the user linked to the employee follow the employee
if 'user_id' in data:
self.message_subscribe_users(cr, uid, [employee_id], [data['user_id']], context=context)
return employee_id
def unlink(self, cr, uid, ids, context=None):

2
addons/hr/mail_message.py
View File

@ -34,7 +34,7 @@ class mail_message(osv.Model):
if model_obj._name == 'hr.employee':
employee_ids = model_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
if len(employee_ids) > 0:
if employee_ids:
model_obj.check_access_rights(cr, uid, 'read')
model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
return

17
addons/mail/static/src/css/mail.css
View File

@ -679,12 +679,11 @@
/* ------------- WALL SIDEBAR ------------- */
.openerp .oe_mail_wall .oe_mail_wall_aside {
margin-left: 20px;
margin-top: 20px;
margin-top: 15px;
position: relative;
display: inline-block;
vertical-align: top;
width: 300px;
width: 260px;
}
.openerp .oe_mail_wall_aside .oe_sidebar_suggestion {
@ -701,11 +700,11 @@
border-radius: 2px;
width: 100%;
margin-left: 10px;
min-height: 70px; /* image_small 66x66px */
min-height: 67px; /* image_small 66x66px */
}
.openerp .oe_mail_wall_aside .oe_item_image {
float: left;
padding-right: 20px;
padding-right: 10px;
}
.openerp .oe_mail_wall_aside .oe_item_image_content {
border-radius: 2px;
@ -716,10 +715,10 @@
}
.openerp .oe_mail_wall_aside .oe_remove_suggested_item,
.openerp .oe_mail_wall_aside .oe_remove_suggestion {
visibility:hidden;
width:3%;
float:right;
margin-right:20px;
visibility: hidden;
width: 3%;
float: right;
margin-right: 10px;
}
.openerp .oe_mail_wall_aside .oe_suggested_item:hover .oe_remove_suggested_item > span,
.openerp .oe_mail_wall_aside .oe_suggestion_display:hover .oe_remove_suggestion > span {