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
=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
--- openerp/addons/base/ir/ir_mail_server.py 2012-03-16 13:20:22 +0000
+++ openerp/addons/base/ir/ir_mail_server.py 2013-05-21 07:50:32 +0000
@@ -33,6 +33,7 @@
3333
34from osv import osv34from osv import osv
35from osv import fields35from osv import fields
36from openerp import SUPERUSER_ID
36from openerp.tools.translate import _37from openerp.tools.translate import _
37from openerp.tools import html2text38from openerp.tools import html2text
38import openerp.tools as tools39import openerp.tools as tools
@@ -416,11 +417,11 @@
416 # Get SMTP Server Details from Mail Server417 # Get SMTP Server Details from Mail Server
417 mail_server = None418 mail_server = None
418 if mail_server_id:419 if mail_server_id:
419 mail_server = self.browse(cr, uid, mail_server_id)420 mail_server = self.browse(cr, SUPERUSER_ID, mail_server_id)
420 elif not smtp_server:421 elif not smtp_server:
421 mail_server_ids = self.search(cr, uid, [], order='sequence', limit=1)422 mail_server_ids = self.search(cr, SUPERUSER_ID, [], order='sequence', limit=1)
422 if mail_server_ids:423 if mail_server_ids:
423 mail_server = self.browse(cr, uid, mail_server_ids[0])424 mail_server = self.browse(cr, SUPERUSER_ID, mail_server_ids[0])
424 else:425 else:
425 # we were passed an explicit smtp_server or nothing at all426 # we were passed an explicit smtp_server or nothing at all
426 smtp_server = smtp_server or tools.config.get('smtp_server')427 smtp_server = smtp_server or tools.config.get('smtp_server')
427428
=== modified file 'openerp/addons/base/security/ir.model.access.csv'
--- openerp/addons/base/security/ir.model.access.csv 2011-11-22 13:11:10 +0000
+++ openerp/addons/base/security/ir.model.access.csv 2013-05-21 07:50:32 +0000
@@ -122,6 +122,6 @@
122"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0122"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
123"access_res_log_all","res.log","model_res_log",,1,1,1,1123"access_res_log_all","res.log","model_res_log",,1,1,1,1
124"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0124"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
125"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0125"access_ir_mail_server","ir_mail_server","model_ir_mail_server","group_system",1,1,1,1
126"access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1126"access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
127"access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0127"access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0