diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py index f2b4979d8f8..8bc487ada7c 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -204,21 +204,21 @@ class config(osv.osv): (_check_model_id, 'Model of selected filter is not matching with model of current template.', ['model_id', 'filter_id']), ] + def get_google_scope(self): + return 'https://www.googleapis.com/auth/drive' + config() class base_config_settings(osv.osv): _inherit = "base.config.settings" - def _get_google_scope(self): - return 'https://www.googleapis.com/auth/drive' - _columns = { 'google_drive_authorization_code': fields.char('Authorization Code', size=124), 'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"), } _defaults = { - 'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', scope=s._get_google_scope(), context=c), + '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), } def set_google_authorization_code(self, cr, uid, ids, context=None): diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py index 62961ee9989..2333adf6751 100644 --- a/addons/google_spreadsheet/google_spreadsheet.py +++ b/addons/google_spreadsheet/google_spreadsheet.py @@ -27,16 +27,13 @@ from openerp.osv import osv from openerp import SUPERUSER_ID -class base_config_settings(osv.osv): - _inherit = "base.config.settings" - - def _get_google_scope(self): - return 'https://www.googleapis.com/auth/drive https://spreadsheets.google.com/feeds' - - class config(osv.osv): _inherit = 'google.drive.config' + def get_google_scope(self): + scope = super(config, self).get_google_scope() + return '%s https://spreadsheets.google.com/feeds' % scope + def write_config_formula(self, cr, uid, attachment_id, spreadsheet_key, model, domain, groupbys, view_id, context=None): access_token = self.get_access_token(cr, uid, scope='https://spreadsheets.google.com/feeds', context=context)