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

[FIX] base, mail: access to ir.config_parameter is now handled by by 

record rules.

Partial revert of commit 80017b04c2.

Conflicts:
	addons/web/static/src/js/chrome.js
This commit is contained in:
Christophe Simonis 2014-08-29 12:01:50 +02:00
parent 1d2fe3330c
commit 0c05a376d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_alias.py
View File

@ -61,7 +61,7 @@ class mail_alias(osv.Model):
def _get_alias_domain(self, cr, uid, ids, name, args, context=None):
ir_config_parameter = self.pool.get("ir.config_parameter")
domain = ir_config_parameter.get_param(cr, SUPERUSER_ID, "mail.catchall.domain", context=context)
domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
return dict.fromkeys(ids, domain or "")
_columns = {

2
openerp/addons/base/security/ir.model.access.csv
View File

@ -108,7 +108,7 @@
"access_multi_company_default user","multi_company_default all","model_multi_company_default",,1,0,0,0
"access_multi_company_default manager","multi_company_default Manager","model_multi_company_default","group_erp_manager",1,1,1,1
"access_ir_filter all","ir_filters all","model_ir_filters",,1,1,1,1
"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter","group_user",1,0,0,0
"access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0
"access_ir_config_parameter_system","ir_config_parameter_system","model_ir_config_parameter","group_system",1,1,1,1
"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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
108 access_multi_company_default user multi_company_default all model_multi_company_default 1 0 0 0
109 access_multi_company_default manager multi_company_default Manager model_multi_company_default group_erp_manager 1 1 1 1
110 access_ir_filter all ir_filters all model_ir_filters 1 1 1 1
111 access_ir_config_parameter ir_config_parameter model_ir_config_parameter group_user 1 0 0 0
112 access_ir_config_parameter_system ir_config_parameter_system model_ir_config_parameter group_system 1 1 1 1
113 access_ir_mail_server ir_mail_server model_ir_mail_server group_system 1 1 1 1
114 access_ir_actions_client ir_actions_client all model_ir_actions_client 1 0 0 0