mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the new autocomplete endpoint OCS 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-03-21 09:46:52 +01:00
parent c8340ace5c
commit dabd7291c3
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/comments/js/commentstabview.js
View File

@ -240,19 +240,22 @@
if(!_.isUndefined(this._autoCompleteRequestCall)) { if(!_.isUndefined(this._autoCompleteRequestCall)) {
this._autoCompleteRequestCall.abort(); this._autoCompleteRequestCall.abort();
} }
this._autoCompleteRequestCall = $.get( this._autoCompleteRequestCall = $.ajax({
OC.generateUrl('/autocomplete/get'), url: OC.linkToOCS('core', 2) + 'autocomplete/get',
{ data: {
search: query, search: query,
itemType: 'files', itemType: 'files',
itemId: s.model.get('id'), itemId: s.model.get('id'),
sorter: 'commenters|share-recipients', sorter: 'commenters|share-recipients',
limit: OC.appConfig.comments.maxAutoCompleteResults limit: OC.appConfig.comments.maxAutoCompleteResults
}, },
function (data) { beforeSend: function (request) {
callback(data); request.setRequestHeader('Accept', 'application/json');
},
success: function (result) {
callback(result.ocs.data);
} }
); });
}, 400); }, 400);
}, },

2
core/Controller/AutoCompleteController.php
View File

@ -23,7 +23,7 @@
namespace OC\Core\Controller; namespace OC\Core\Controller;
use OCP\AppFramework\Controller; use OCP\AppFramework\OCSController as Controller;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\Collaboration\AutoComplete\IManager; use OCP\Collaboration\AutoComplete\IManager;
use OCP\Collaboration\Collaborators\ISearch; use OCP\Collaboration\Collaborators\ISearch;

2
core/routes.php
View File

@ -64,7 +64,6 @@ $application->registerRoutes($this, [
['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'], ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'], ['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', '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' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
['name' => 'Search#search', 'url' => '/core/search', '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' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', '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' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'],
['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'],
], ],
]); ]);