From 6028d600385ab4420f6b6e3abf6432c193b1faa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 10 Apr 2018 12:08:10 +0200 Subject: [PATCH 1/2] Add language support for user creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/provisioning_api/lib/Controller/UsersController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 420c09dfec..7bbbe55483 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -206,7 +206,8 @@ class UsersController extends AUserData { string $email = '', array $groups = [], array $subadmin = [], - string $quota = ''): DataResponse { + string $quota = '', + string $language = 'en'): DataResponse { $user = $this->userSession->getUser(); $isAdmin = $this->groupManager->isAdmin($user->getUID()); $subAdminManager = $this->groupManager->getSubAdmin(); @@ -279,6 +280,10 @@ class UsersController extends AUserData { $this->editUser($userid, 'quota', $quota); } + if ($language !== '') { + $this->editUser($userid, 'language', $language); + } + // Send new user mail only if a mail is set if ($email !== '') { $newUser->setEMailAddress($email); From 5bd02a63a86ba053c14ce544fa37ac0b56909a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 12 Apr 2018 12:37:26 +0200 Subject: [PATCH 2/2] Fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/provisioning_api/lib/Controller/UsersController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 7bbbe55483..30812a3ca0 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -198,6 +198,7 @@ class UsersController extends AUserData { * @param array $groups * @param array $subadmins * @param string $quota + * @param string $language * @return DataResponse * @throws OCSException */ @@ -207,7 +208,7 @@ class UsersController extends AUserData { array $groups = [], array $subadmin = [], string $quota = '', - string $language = 'en'): DataResponse { + string $language = ''): DataResponse { $user = $this->userSession->getUser(); $isAdmin = $this->groupManager->isAdmin($user->getUID()); $subAdminManager = $this->groupManager->getSubAdmin();