[Sharing 2.0] update share #21887
Merged
[Sharing 2.0] update share #21887
Conversation
This file contains 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
|
By analyzing the blame information on this pull request, we identified @DeepDiver1975 to be a potential reviewer |
| if ($publicUpload === 'true') { | ||
| $share->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE); | ||
| } else if ($publicUpload === 'false') { | ||
| $share->setPermissions(\OCP\Constants::PERMISSION_READ); |
There was a problem hiding this comment.
ok, so "publicUpload" has priority over "permissions", got it.
|
Code looks good 👍 |
|
smashbox tests had a timeout... |
rullzer
force-pushed
the
share2_updateShare
branch
from
4104960
to
44c073b
Compare
| ->set('item_source', $qb->createNamedParameter($share->getPath()->getId())) | ||
| ->set('file_source', $qb->createNamedParameter($share->getPath()->getId())) | ||
| ->set('token', $qb->createNamedParameter($share->getToken())) | ||
| ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime')) |
There was a problem hiding this comment.
IQueryBuilder::PARAM_DATE instead of 'datetime'
There was a problem hiding this comment.
yeah was not there when this code was writen... but will fix :)
|
besides my notes 👍 |
|
Rebased and comments addressed. lets see if CI still thinks everything is fine. |
| if ($fileTarget) $qb->setValue('file_target', $qb->expr()->literal($fileTarget)); | ||
| if ($permissions) $qb->setValue('permissions', $qb->expr()->literal($permissions)); | ||
| if ($token) $qb->setValue('token', $qb->expr()->literal($token)); | ||
| if ($expiration) $qb->setValue('expiration', $qb->createNamedParameter($expiration, 'datetime')); |
rullzer
force-pushed
the
share2_updateShare
branch
from
29b8985
to
d11682d
Compare
|
@nickvergessen could you smash this? Just to be sure. |
|
Smashbox tests passed for me locally. |
|
Awesome thanks... then this is good to go! |
DeepDiver1975
added a commit
that referenced
this pull request
Jan 27, 2016
[Sharing 2.0] update share
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
More for #19331
Updating shares is now handled in the sharemanager.
Basically we run the same bunch of tests for updateShare as we do for createShare. And some more.
Please have a look: @DeepDiver1975 @schiesbn @nickvergessen @PVince81