diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-05-21 15:30:25 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-05-21 15:30:25 +0200 |
| commit | b8aed2249a5fb072c8a591e6fed250005fed6d06 (patch) | |
| tree | 1ae75bbedf4197ce1368aca57b3129e8986a08be | |
| parent | 04a32e5ef25a374ee1bb64bc2ff7082b8d5eaa64 (diff) | |
[IMP] remove read access to outgoing mail server configuration
forward port of rev 4349 in 6.1
bzr revid: mat@openerp.com-20130521133025-198z6n1nqltcisx2
| -rw-r--r-- | openerp/addons/base/ir/ir_mail_server.py | 7 | ||||
| -rw-r--r-- | openerp/addons/base/security/ir.model.access.csv | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 5a3c40552f0..ac2dfe6cc8c 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -31,6 +31,7 @@ import re import smtplib import threading +from openerp import SUPERUSER_ID from openerp.osv import osv, fields from openerp.tools.translate import _ from openerp.tools import html2text @@ -417,11 +418,11 @@ class ir_mail_server(osv.osv): # Get SMTP Server Details from Mail Server mail_server = None if mail_server_id: - mail_server = self.browse(cr, uid, mail_server_id) + mail_server = self.browse(cr, SUPERUSER_ID, mail_server_id) elif not smtp_server: - mail_server_ids = self.search(cr, uid, [], order='sequence', limit=1) + mail_server_ids = self.search(cr, SUPERUSER_ID, [], order='sequence', limit=1) if mail_server_ids: - mail_server = self.browse(cr, uid, mail_server_ids[0]) + mail_server = self.browse(cr, SUPERUSER_ID, mail_server_ids[0]) if mail_server: smtp_server = mail_server.smtp_host diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv index 35d5b82bc41..e3198abb8fa 100644 --- a/openerp/addons/base/security/ir.model.access.csv +++ b/openerp/addons/base/security/ir.model.access.csv @@ -114,7 +114,7 @@ "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1 "access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0 -"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0 +"access_ir_mail_server","ir_mail_server","model_ir_mail_server","group_system",1,1,1,1 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0 "access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1 |