openstack
/
manila
Code Issues Proposed changes

Merge "Define context.roles with base class"

This commit is contained in:
Jenkins 2016-02-28 11:31:48 +00:00 committed by Gerrit Code Review
parent df6feb6824 e3f20e2455
commit 21cc6fea34
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/context.py
View File

@ -65,11 +65,11 @@ class RequestContext(context.RequestContext):
tenant=project_id or tenant, tenant=project_id or tenant,
is_admin=is_admin, is_admin=is_admin,
request_id=request_id, request_id=request_id,
overwrite=overwrite) overwrite=overwrite,
roles=roles)
self.user_id = self.user self.user_id = self.user
self.project_id = self.tenant self.project_id = self.tenant
self.roles = roles or []
if self.is_admin is None: if self.is_admin is None:
self.is_admin = policy.check_is_admin(self.roles) self.is_admin = policy.check_is_admin(self.roles)
@ -111,7 +111,6 @@ class RequestContext(context.RequestContext):
'user_id': self.user_id, 'user_id': self.user_id,
'project_id': self.project_id, 'project_id': self.project_id,
'read_deleted': self.read_deleted, 'read_deleted': self.read_deleted,
'roles': self.roles,
'remote_address': self.remote_address, 'remote_address': self.remote_address,
'timestamp': self.timestamp.isoformat(), 'timestamp': self.timestamp.isoformat(),
'quota_class': self.quota_class, 'quota_class': self.quota_class,