Skip to content

Commit

Permalink
Merge pull request #6890 from owncloud/tus-upload-public-links
Browse files Browse the repository at this point in the history
Enable tus upload for password protected public links
  • Loading branch information
JammingBen authored May 6, 2022
2 parents 97ab453 + b05ea89 commit 6cdeeaa
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .drone.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The version of OCIS to use in pipelines that test against OCIS
OCIS_COMMITID=a11250ee1c79d2c290c393b697b6553a1e540127
OCIS_COMMITID=761d72d901cce2c03b524d11cf0b169293e2c8cd
OCIS_BRANCH=master
6 changes: 6 additions & 0 deletions changelog/unreleased/enhancement-tus-uploads-on-public-pages
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Enable tus upload for password protected public links

Uploading files on password protected public links now features tus uploads if the backend supports it.

https://github.com/owncloud/web/issues/6819
https://github.com/owncloud/web/pull/6890
3 changes: 1 addition & 2 deletions packages/web-runtime/src/composables/upload/useUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ export function useUpload(options: UploadOptions): UploadResult {
watch(
uppyOptions,
() => {
// @TODO use Tus once the backend supports it on password protected links
if (unref(uppyOptions).isTusSupported && !unref(publicLinkPassword)) {
if (unref(uppyOptions).isTusSupported) {
options.uppyService.useTus(unref(uppyOptions) as any)
return
}
Expand Down

0 comments on commit 6cdeeaa

Please sign in to comment.