diff options
| author | Jeremy Kersten <jke@odoo.com> | 2014-06-23 16:52:40 +0200 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2014-06-26 16:27:24 +0200 |
| commit | f337bcaa1df4e0689ff07ff39497eabf31c93c29 (patch) | |
| tree | ab5daa0bece23d95a7a7367c512ee83bd19e818b /addons | |
| parent | fd8ae038d87d332e1804c4c6b3c9b164564ab9f4 (diff) | |
[IMP] ir.config.parameters: support group-based access control
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/base_gengo/wizard/base_gengo_translations.py | 2 | ||||
| -rw-r--r-- | addons/google_account/google_account.py | 4 | ||||
| -rw-r--r-- | addons/google_calendar/res_config.py | 4 | ||||
| -rw-r--r-- | addons/google_drive/google_drive.py | 6 | ||||
| -rw-r--r-- | addons/google_drive/google_drive_data.xml | 2 | ||||
| -rw-r--r-- | addons/mail/update.py | 2 | ||||
| -rw-r--r-- | addons/web_linkedin/web_linkedin.py | 2 |
7 files changed, 12 insertions, 10 deletions
diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py index 6c6ce1e6b42..4ef13eb7b46 100644 --- a/addons/base_gengo/wizard/base_gengo_translations.py +++ b/addons/base_gengo/wizard/base_gengo_translations.py @@ -57,7 +57,7 @@ class base_gengo_translations(osv.osv_memory): def init(self, cr): icp = self.pool['ir.config_parameter'] if not icp.get_param(cr, SUPERUSER_ID, self.GENGO_KEY, default=None): - icp.set_param(cr, SUPERUSER_ID, self.GENGO_KEY, str(uuid.uuid4())) + icp.set_param(cr, SUPERUSER_ID, self.GENGO_KEY, str(uuid.uuid4()), groups=['base.group_website_designer', 'base.group_website_publisher']) def get_gengo_key(self, cr): icp = self.pool['ir.config_parameter'] diff --git a/addons/google_account/google_account.py b/addons/google_account/google_account.py index 7ffa4f95f48..4968925bd29 100644 --- a/addons/google_account/google_account.py +++ b/addons/google_account/google_account.py @@ -174,10 +174,10 @@ class google_service(osv.osv_memory): return self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://www.openerp.com?NoBaseUrl', context=context) def get_client_id(self, cr, uid, service, context=None): - return self.pool.get('ir.config_parameter').get_param(cr, uid, 'google_%s_client_id' % (service,), default=False, context=context) + return self.pool.get('ir.config_parameter').get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % (service,), default=False, context=context) def get_client_secret(self, cr, uid, service, context=None): - return self.pool.get('ir.config_parameter').get_param(cr, uid, 'google_%s_client_secret' % (service,), default=False, context=context) + return self.pool.get('ir.config_parameter').get_param(cr, SUPERUSER_ID, 'google_%s_client_secret' % (service,), default=False, context=context) def get_uri_oauth(self, a=''): # a = optional action return "https://accounts.google.com/o/oauth2/%s" % (a,) diff --git a/addons/google_calendar/res_config.py b/addons/google_calendar/res_config.py index 78b2a4b6803..ec0f2e4d95b 100644 --- a/addons/google_calendar/res_config.py +++ b/addons/google_calendar/res_config.py @@ -13,8 +13,8 @@ class calendar_config_settings(osv.TransientModel): def set_calset(self,cr,uid,ids,context=None) : params = self.pool['ir.config_parameter'] myself = self.browse(cr,uid,ids[0],context=context) - params.set_param(cr, uid, 'google_calendar_client_id', myself.cal_client_id or '', context=None) - params.set_param(cr, uid, 'google_calendar_client_secret', myself.cal_client_secret or '', context=None) + params.set_param(cr, uid, 'google_calendar_client_id', myself.cal_client_id or '', groups=['base.group_system'], context=None) + params.set_param(cr, uid, 'google_calendar_client_secret', myself.cal_client_secret or '', groups=['base.group_system'], context=None) def get_default_all(self,cr,uid,ids,context=None): diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py index a6ca39d9982..cd8fc486a89 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -240,7 +240,7 @@ class base_config_settings(osv.TransientModel): } _defaults = { 'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', scope=s.pool['google.drive.config'].get_google_scope(), context=c), - 'google_drive_authorization_code': lambda s, cr, uid, c: s.pool['ir.config_parameter'].get_param(cr, uid, 'google_drive_authorization_code', context=c), + 'google_drive_authorization_code': lambda s, cr, uid, c: s.pool['ir.config_parameter'].get_param(cr, SUPERUSER_ID, 'google_drive_authorization_code', context=c), } def set_google_authorization_code(self, cr, uid, ids, context=None): @@ -249,5 +249,5 @@ class base_config_settings(osv.TransientModel): auth_code = config.google_drive_authorization_code if auth_code and auth_code != ir_config_param.get_param(cr, uid, 'google_drive_authorization_code', context=context): refresh_token = self.pool['google.service'].generate_refresh_token(cr, uid, 'drive', config.google_drive_authorization_code, context=context) - ir_config_param.set_param(cr, uid, 'google_drive_authorization_code', auth_code) - ir_config_param.set_param(cr, uid, 'google_drive_refresh_token', refresh_token) + ir_config_param.set_param(cr, uid, 'google_drive_authorization_code', auth_code, groups=['base.group_system']) + ir_config_param.set_param(cr, uid, 'google_drive_refresh_token', refresh_token, groups=['base.group_system']) diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/google_drive_data.xml index b1f9883c149..f3f916b201b 100644 --- a/addons/google_drive/google_drive_data.xml +++ b/addons/google_drive/google_drive_data.xml @@ -5,11 +5,13 @@ <record id="config_google_drive_client_id" model="ir.config_parameter"> <field name="key">google_drive_client_id</field> <field name="value">598905559630.apps.googleusercontent.com</field> + <field name="group_ids" eval="[(4, ref('base.group_user'))]" /> </record> <record id="config_google_drive_client_secret" model="ir.config_parameter"> <field name="key">google_drive_client_secret</field> <field name="value">vTmou73c-njP-1qCxm7qx7QE</field> + <field name="group_ids" eval="[(4, ref('base.group_system'))]" /> </record> </data> diff --git a/addons/mail/update.py b/addons/mail/update.py index 6969b1479b1..d2873f3a5bf 100644 --- a/addons/mail/update.py +++ b/addons/mail/update.py @@ -29,7 +29,7 @@ def get_sys_logs(self, cr, uid): pool = openerp.registry(cr.dbname) dbuuid = pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid') - db_create_date = pool.get('ir.config_parameter').get_param(cr, uid, 'database.create_date') + db_create_date = pool.get('ir.config_parameter').get_param(cr, SUPERUSER_ID, 'database.create_date') limit_date = datetime.datetime.now() limit_date = limit_date - datetime.timedelta(15) limit_date_str = limit_date.strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT) diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py index 09c40076ea0..aa365bced69 100644 --- a/addons/web_linkedin/web_linkedin.py +++ b/addons/web_linkedin/web_linkedin.py @@ -52,7 +52,7 @@ class web_linkedin_settings(osv.osv_memory): def set_linkedin(self, cr, uid, ids, context=None): key = self.browse(cr, uid, ids[0], context)["api_key"] or "" - self.pool.get("ir.config_parameter").set_param(cr, uid, "web.linkedin.apikey", key) + self.pool.get("ir.config_parameter").set_param(cr, uid, "web.linkedin.apikey", key, groups=['base.group_users']) class web_linkedin_fields(osv.Model): _inherit = 'res.partner' |
