Skip to content

Transfer ownership function polishing #18270

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 8 commits into from
Dec 17, 2019
Merged

Transfer ownership function polishing #18270

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1319e1
Transfer ownership function polishing
wiswedel Dec 6, 2019
f567566
notification polishing
wiswedel Dec 6, 2019
a64b5de
transfer ownership dialog word choice
wiswedel Dec 6, 2019
6a6b6dd
added patience note for sharee
wiswedel Dec 9, 2019
bdceb0d
rephrase "Target user" to "new owner"
wiswedel Dec 10, 2019
09f1c63
Show path and uid on transfer button
gary-kim Dec 15, 2019
e1382e2
Clean up publishing
gary-kim Dec 16, 2019
a1df5d1
added line breaks to incoming transfer notification
wiswedel Dec 16, 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
added line breaks to incoming transfer notification 
wrapped notifications into double quotes to make line breaks possible

Signed-off-by: Sascha Wiswedel <[email protected]>
  • Loading branch information
@wiswedel @rullzer
wiswedel authored and rullzer committed Dec 17, 2019
commit a1df5d1e98f285b94b1c2a5338c41a70960785af
4 changes: 2 additions & 2 deletions apps/files/lib/Notification/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@ public function handleTransferownershipRequest(INotification $notification, stri
])
->setParsedSubject(str_replace('{user}', $param['sourceUser'], $l->t('Incoming ownership transfer from {user}')))
->setRichMessage(
$l->t('Do you want to accept {path}? Note: The transfer process after accepting may take up to 1 hour.'),
$l->t("Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour."),
[
'path' => [
'type' => 'highlight',
'id' => $param['targetUser'] . '::' . $param['nodeName'],
'name' => $param['nodeName'],
]
])
->setParsedMessage(str_replace('{path}', $param['nodeName'], $l->t('Do you want to accept {path}? Note: The transfer process after accepting may take up to 1 hour.')));
->setParsedMessage(str_replace('{path}', $param['nodeName'], $l->t("Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour.")));

return $notification;
}
Expand Down