Merge " Fixing bug 859937. Removing incorrect atom feed references fr…

…om roles.xsd."
pvo · Oct 13, 2011 · 3b08b94 · 3b08b94
2 parents 4b07efe + 8ff740d
commit 3b08b94
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/keystone/content/common/xsd/roles.xsd b/keystone/content/common/xsd/roles.xsd
@@ -47,10 +47,6 @@
 
     <!-- Complex Types -->
     <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="name" type="xsd:string" use="required"/>
         <attribute name="description" type="xsd:string"  use="optional"/>

diff --git a/keystone/controllers/roles.py b/keystone/controllers/roles.py
@@ -59,4 +59,4 @@ def delete_role_ref(self, req, user_id, role_ref_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),
             user_id, role_id)
-        return utils.send_result(201)
+        return utils.send_result(201, None)
diff --git a/keystone/utils.py b/keystone/utils.py
@@ -120,7 +120,6 @@ def send_result(code, req, result=None):
         else:
             content = result.to_json()
             resp.headers['content-type'] = "application/json"
-
         resp.content_type_params = {'charset': 'UTF-8'}
         resp.unicode_body = content.decode('UTF-8')