diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-03-22 11:53:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 11:53:23 +0100 |
| commit | 91b9c0d2c4f825043b159103f9e1ddde89682ff0 (patch) | |
| tree | ace3f8f0cb1145f17ccd78c96db2caafa8aa205c | |
| parent | f843b7edfe7b3bc6e45d4610778d2df98b3985e3 (diff) | |
| parent | dabd7291c35599dd072cc82b93b3f1c2628835a7 (diff) | |
| download | nextcloud-server-91b9c0d2c4f825043b159103f9e1ddde89682ff0.tar.gz nextcloud-server-91b9c0d2c4f825043b159103f9e1ddde89682ff0.zip | |
Merge pull request #8909 from nextcloud/feature/noid/make-the-autocomplete-endpoint-ocs
Make the new autocomplete endpoint OCS
| -rw-r--r-- | apps/comments/js/commentstabview.js | 15 | ||||
| -rw-r--r-- | core/Controller/AutoCompleteController.php | 2 | ||||
| -rw-r--r-- | core/routes.php | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 9e501b141a7..20f1f590a28 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -240,19 +240,22 @@ if(!_.isUndefined(this._autoCompleteRequestCall)) { this._autoCompleteRequestCall.abort(); } - this._autoCompleteRequestCall = $.get( - OC.generateUrl('/autocomplete/get'), - { + this._autoCompleteRequestCall = $.ajax({ + url: OC.linkToOCS('core', 2) + 'autocomplete/get', + data: { search: query, itemType: 'files', itemId: s.model.get('id'), sorter: 'commenters|share-recipients', limit: OC.appConfig.comments.maxAutoCompleteResults }, - function (data) { - callback(data); + beforeSend: function (request) { + request.setRequestHeader('Accept', 'application/json'); + }, + success: function (result) { + callback(result.ocs.data); } - ); + }); }, 400); }, diff --git a/core/Controller/AutoCompleteController.php b/core/Controller/AutoCompleteController.php index 93ab9291322..3f3858ce1c8 100644 --- a/core/Controller/AutoCompleteController.php +++ b/core/Controller/AutoCompleteController.php @@ -23,7 +23,7 @@ namespace OC\Core\Controller; -use OCP\AppFramework\Controller; +use OCP\AppFramework\OCSController as Controller; use OCP\AppFramework\Http\DataResponse; use OCP\Collaboration\AutoComplete\IManager; use OCP\Collaboration\Collaborators\ISearch; diff --git a/core/routes.php b/core/routes.php index 87c265d8098..1c7be78bc78 100644 --- a/core/routes.php +++ b/core/routes.php @@ -64,7 +64,6 @@ $application->registerRoutes($this, [ ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'], ['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'], ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'], - ['name' => 'AutoComplete#get', 'url' => 'autocomplete/get', 'verb' => 'GET'], ['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'], ['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'], ], @@ -75,6 +74,7 @@ $application->registerRoutes($this, [ ['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'], ['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'], ['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'], + ['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'], ], ]); |