openstack/keystone
Code Issues Proposed changes

Fixing bug 859937.

Browse Source 
Removing incorrect atom feed references from roles.xsd.

Change-Id: I3fabbf280c372bdd7cbc920adf62fabe7c292f58
This commit is contained in:
Yogeshwar Srikrishnan 2011-10-13 10:43:16 -05:00
parent 1bf12cc415
commit 8ff740d6b4
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/content/common/xsd/roles.xsd
View File

@ -47,10 +47,6 @@
<!-- Complex Types --> <!-- Complex Types -->
<complexType name="Role"> <complexType name="Role">
<sequence>
<element vc:minVersion="1.1" ref="atom:link" minOccurs="0" maxOccurs="unbounded" />
<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
</sequence>
<attribute name="id" type="xsd:string" use="optional"/> <attribute name="id" type="xsd:string" use="optional"/>
<attribute name="name" type="xsd:string" use="required"/> <attribute name="name" type="xsd:string" use="required"/>
<attribute name="description" type="xsd:string" use="optional"/> <attribute name="description" type="xsd:string" use="optional"/>

2
keystone/controllers/roles.py
View File

@ -59,4 +59,4 @@ class RolesController(wsgi.Controller):
def add_global_role_to_user(self, req, user_id, role_id): def add_global_role_to_user(self, req, user_id, role_id):
config.SERVICE.add_global_role_to_user(utils.get_auth_token(req), config.SERVICE.add_global_role_to_user(utils.get_auth_token(req),
user_id, role_id) user_id, role_id)
return utils.send_result(201) return utils.send_result(201, None)

1
keystone/utils.py
View File

@ -120,7 +120,6 @@ def send_result(code, req, result=None):
else: else:
content = result.to_json() content = result.to_json()
resp.headers['content-type'] = "application/json" resp.headers['content-type'] = "application/json"
resp.content_type_params = {'charset': 'UTF-8'} resp.content_type_params = {'charset': 'UTF-8'}
resp.unicode_body = content.decode('UTF-8') resp.unicode_body = content.decode('UTF-8')