Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.1-mail-server-access-mat into lp:openobject-server/6.1

  1. 6.1-mail-server-access-mat
  2. Merge into 6.1
Proposed by Martin Trigaux (OpenERP)
Status: Merged
Merged at revision: 4349
Proposed branch: lp:~openerp-dev/openobject-server/6.1-mail-server-access-mat
Merge into: lp:openobject-server/6.1
Diff against target: 38 lines (+5/-4)
2 files modified
openerp/addons/base/ir/ir_mail_server.py (+4/-3)
openerp/addons/base/security/ir.model.access.csv (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.1-mail-server-access-mat
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+164850@code.launchpad.net

Description of the change

Protect smtp server configuration

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
2--- openerp/addons/base/ir/ir_mail_server.py 2012-03-16 13:20:22 +0000
3+++ openerp/addons/base/ir/ir_mail_server.py 2013-05-21 07:50:32 +0000
4@@ -33,6 +33,7 @@
5
6 from osv import osv
7 from osv import fields
8+from openerp import SUPERUSER_ID
9 from openerp.tools.translate import _
10 from openerp.tools import html2text
11 import openerp.tools as tools
12@@ -416,11 +417,11 @@
13 # Get SMTP Server Details from Mail Server
14 mail_server = None
15 if mail_server_id:
16- mail_server = self.browse(cr, uid, mail_server_id)
17+ mail_server = self.browse(cr, SUPERUSER_ID, mail_server_id)
18 elif not smtp_server:
19- mail_server_ids = self.search(cr, uid, [], order='sequence', limit=1)
20+ mail_server_ids = self.search(cr, SUPERUSER_ID, [], order='sequence', limit=1)
21 if mail_server_ids:
22- mail_server = self.browse(cr, uid, mail_server_ids[0])
23+ mail_server = self.browse(cr, SUPERUSER_ID, mail_server_ids[0])
24 else:
25 # we were passed an explicit smtp_server or nothing at all
26 smtp_server = smtp_server or tools.config.get('smtp_server')
27
28=== modified file 'openerp/addons/base/security/ir.model.access.csv'
29--- openerp/addons/base/security/ir.model.access.csv 2011-11-22 13:11:10 +0000
30+++ openerp/addons/base/security/ir.model.access.csv 2013-05-21 07:50:32 +0000
31@@ -122,6 +122,6 @@
32 "access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
33 "access_res_log_all","res.log","model_res_log",,1,1,1,1
34 "access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
35-"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
36+"access_ir_mail_server","ir_mail_server","model_ir_mail_server","group_system",1,1,1,1
37 "access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
38 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0