Move to OCS API #53
Merged
Move to OCS API #53
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lib/Controller/LockController.php
Outdated
| @@ -47,7 +46,7 @@ | |||
| * | |||
| * @package OCA\FilesLock\Controller | |||
| */ | |||
| class LockController extends Controller { | |||
| class LockController extends \OCP\AppFramework\OCSController { | |||
There was a problem hiding this comment.
maybe import OCSController
lib/Controller/LockController.php
Outdated
| @@ -94,7 +93,7 @@ public function locking(string $fileId): DataResponse { | |||
| $user = $this->userSession->getUser(); | |||
| $file = $this->fileService->getFileFromId($user->getUID(), (int)$fileId); | |||
|
|
|||
| $lock = $this->lockService->lockFile($file, $user); | |||
| $lock = $this->lockService->lockFileAsUser($file, $user); | |||
There was a problem hiding this comment.
I haven't test does lockFileAsUser() exist in LockService ?
There was a problem hiding this comment.
Whoops, good catch, seems I failed to commit only the relevant parts here, this is from #54
|
Code looks good, will test (the OCS part) later |
|
can you remove it so we can work on merging this one ? |
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliusknorr
force-pushed
the
enh/ocs-api
branch
from
81c0b3f to
c211bbe
Compare
|
Comments addressed |
ArtificialOwl
approved these changes
Mar 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will make sure that the API can be used properly by clients.
Fixes #48 though the final API to be implemented in clients should also include further API adjustments for #51, so this might change during further development effort.