diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-05-23 19:52:19 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-06-06 11:40:09 +0200 |
| commit | 0a7ab6f66f46bbae56bad10740bf9960179bf57e (patch) | |
| tree | 97dcf35b00bacc441a2c720123cfbf0347783630 /settings/routes.php | |
| parent | 7fc2a29c22f8f9ff8688eb9217f2a88e49a28801 (diff) | |
| download | nextcloud-server-0a7ab6f66f46bbae56bad10740bf9960179bf57e.tar.gz nextcloud-server-0a7ab6f66f46bbae56bad10740bf9960179bf57e.zip | |
Reorder routes to avoid conflicts
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'settings/routes.php')
| -rw-r--r-- | settings/routes.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/routes.php b/settings/routes.php index e0c0eb3d9bf..bd6713a7c16 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -46,13 +46,10 @@ $application->registerRoutes($this, [ ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'], ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'], ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'], + ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'], ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'], ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'], - - ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => '']], - ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => '']], - ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET'], ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST'], ['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST'], @@ -60,6 +57,9 @@ $application->registerRoutes($this, [ ['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST'], ['name' => 'AppSettings#updateApp', 'url' => '/settings/apps/update/{appId}', 'verb' => 'GET'], ['name' => 'AppSettings#uninstallApp', 'url' => '/settings/apps/uninstall/{appId}', 'verb' => 'GET'], + ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => '']], + ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => '']], + ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'], ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'], ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'], |