Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/11.0' into 12.0-merge-and-port-o…

…penapi
  • Loading branch information...
yelizariev committed Aug 20, 2019
2 parents 61bbcec + 3a2defa commit 473a962104fbb6afbc0925dba6899f58c16ac5aa
Showing with 3 additions and 3 deletions.
  1. +1 −1 openapi/controllers/pinguin.py
  2. +1 −2 openapi/models/openapi_access.py
  3. +1 −0 openapi/models/openapi_log.py
@@ -189,7 +189,7 @@ def get_data_from_auth_header(header):
"""
normalized_token = header.replace('Basic ', '').replace('\\n', '').encode('utf-8')
try:
decoded_token_parts = base64.decodestring(normalized_token).split(':')
decoded_token_parts = base64.decodestring(normalized_token).split(b':')
except TypeError:
raise werkzeug.exceptions.HTTPException(response=error_response(500, 'Invalid header', 'Basic auth header must be valid base64 string'))

@@ -35,7 +35,7 @@ class Access(models.Model):
'Integration',
required=True)
model_id = fields.Many2one('ir.model', 'Model', required=True)
model = fields.Char(related='model_id.model')
model = fields.Char('Model Name', related='model_id.model')
api_create = fields.Boolean('Create via API', default=False)
api_read = fields.Boolean('Read via API', default=False)
api_update = fields.Boolean('Update via API', default=False)
@@ -525,7 +525,6 @@ def getmembers(object, predicate=None):
# like calling their __get__ (see bug #1785), so fall back to
# looking in the __dict__.
try:
print('object, key', (object, key))
value = getattr(object, key)
# handle the duplicate key
if key in processed:
@@ -7,6 +7,7 @@
class Log(models.Model):
_name = 'openapi.log'
_order = 'id desc'
_description = 'OpenAPI logs'

namespace_id = fields.Many2one('openapi.namespace', 'Integration')
request = fields.Char('Request')

0 comments on commit 473a962

Please sign in to comment.
You can’t perform that action at this time.