Skip to content

Add a transfer ownership background job #17736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Dec 2, 2019
Merged

Add a transfer ownership background job #17736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5274c54
Add a transfer ownership background job
rullzer Oct 29, 2019
08a1b92
Also allow transfer ownership of files
ChristophWurst Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Also allow transfer ownership of files 
Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst @rullzer
ChristophWurst authored and rullzer committed Dec 2, 2019
commit 08a1b928aa162921bd5adb7a52295659fc7fefe0
8 changes: 4 additions & 4 deletions apps/files/js/dist/personal-settings.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/js/dist/personal-settings.js.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions apps/files/js/dist/sidebar.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/js/dist/sidebar.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/lib/Service/OwnershipTransferService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function transfer(IUser $sourceUser,
Filesystem::initMountPoints($destinationUid);

$view = new View();
if (!$view->is_dir($sourcePath)) {
if (!($view->is_dir($sourcePath) || $view->is_file($sourcePath))) {
throw new TransferOwnershipException("Unknown path provided: $path", 1);
}

Expand Down
17 changes: 13 additions & 4 deletions apps/files/src/logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@
import { getCurrentUser } from '@nextcloud/auth'
import { getLoggerBuilder } from '@nextcloud/logger'

export default getLoggerBuilder()
.setApp('files')
.setUid(getCurrentUser().uid)
.build()
const getLogger = user => {
if (user === null) {
return getLoggerBuilder()
.setApp('files')
.build()
}
return getLoggerBuilder()
.setApp('files')
.setUid(user.uid)
.build()
}

export default getLogger(getCurrentUser())