diff options
| -rw-r--r-- | lib/private/AppFramework/Routing/RouteConfig.php | 8 | ||||
| -rw-r--r-- | settings/routes.php | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index e2675a3c847..70208725f46 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -231,15 +231,9 @@ class RouteConfig { $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method); - $route = $this->router->create($routeName, $url)->method($verb)->action( + $this->router->create($routeName, $url)->method($verb)->action( new RouteActionHandler($this->container, $controllerName, $actionName) ); - - if (!$collectionAction) { - $route->requirements([ - 'id' => '[^?]*' - ]); - } } } } 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'], ] ]); |