diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-20 10:25:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 10:25:16 +0200 |
| commit | 799b229a68d3478809c084d58b69288061139ab1 (patch) | |
| tree | 54c8c71a230b537495401a814386a4c86915735c /settings | |
| parent | adf316c3af6c03d2f366491a6927a724cf239425 (diff) | |
| parent | 2850f09bf222e529bca3885663cdd3d002c25712 (diff) | |
| download | nextcloud-server-799b229a68d3478809c084d58b69288061139ab1.tar.gz nextcloud-server-799b229a68d3478809c084d58b69288061139ab1.zip | |
Merge pull request #4381 from nextcloud/2954_take_2
Fix group settings routes and fix route regression
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/routes.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/settings/routes.php b/settings/routes.php index 3f034d363e2..b76bb213d0c 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -37,7 +37,6 @@ namespace OC\Settings; $application = new Application(); $application->registerRoutes($this, [ 'resources' => [ - 'groups' => ['url' => '/settings/users/groups'], 'users' => ['url' => '/settings/users/users'], 'AuthSettings' => ['url' => '/settings/personal/authtokens'], ], @@ -69,6 +68,11 @@ $application->registerRoutes($this, [ ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'], ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'], ['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'], + ['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'], + ['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'], + ['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'], + ['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'], + ['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'], ] ]); |