Merge "v2 api: change update user"

api-ref/source/v2-admin/admin-users.inc

@@ -127,6 +127,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - userId: userId
    - username: username
    - enabled: enabled
    - email: email
@@ -144,11 +145,18 @@ Response Parameters
 
 .. rest_parameters:: parameters.yaml
 
+   - users: users
    - enabled: enabled
    - email: email
    - name: name
    - id: id
 
+Response Example
+----------------
+
+.. literalinclude:: samples/admin/user-update-response.json
+   :language: javascript
+
 
 Delete user (admin endpoint)
 ============================

api-ref/source/v2-admin/samples/admin/user-show-response.json

@@ -1,9 +1,9 @@
 {
     "user": {
-        "username": "nova",
-        "name": "nova",
-        "enabled": true,
-        "email": null,
-        "id": "405ecdef1a434c70bb1e441cd295245d"
+        "id": "3c9530e",
+        "name": "admin",
+        "email": "admin@example.org",
+        "username": "admin",
+        "enabled": true
     }
 }

api-ref/source/v2-admin/samples/admin/user-update-request.json

@@ -1,8 +1,5 @@
 {
     "user": {
-        "username": "nova",
-        "name": "nova",
-        "enabled": false,
-        "email": null
+        "email": "updated_email@example.org"
     }
 }

api-ref/source/v2-admin/samples/admin/user-update-response.json

@@ -0,0 +1,9 @@
+{
+    "user": {
+        "id": "a0ae37b",
+        "name": "demo",
+        "email": "updated_email@example.org",
+        "username": "demo",
+        "enabled": true
+    }
+}

api-ref/source/v2-ext/ksadm-admin.inc

@@ -571,47 +571,6 @@ Request
    - roleId: roleId
 
 
-Update user (admin extension)
-=============================
-
-.. rest_method::  PUT /v2.0/users/{userId}
-
-Updates a user.
-
-Normal response codes: 200
-Error response codes: 413,415,405,404,403,401,400,503,409
-
-Request
--------
-
-.. rest_parameters:: parameters.yaml
-
-   - userId: userId
-
-Request Example
----------------
-
-.. literalinclude:: samples/OS-KSADM/user-update-request.json
-   :language: javascript
-
-Response Parameters
--------------------
-
-.. rest_parameters:: parameters.yaml
-
-   - users: users
-   - enabled: enabled
-   - email: email
-   - name: name
-   - id: id
-
-Response Example
-----------------
-
-.. literalinclude:: samples/OS-KSADM/user-show-response.json
-   :language: javascript
-
-
 Delete user (admin extension)
 =============================
 

api-ref/source/v2-ext/samples/OS-KSADM/user-update-request.json

@@ -1,8 +0,0 @@
-{
-    "user": {
-        "id": "u1000",
-        "name": "jqsmith",
-        "email": "john.smith@example.org",
-        "enabled": true
-    }
-}