diff --git a/dev/docker/oc10.config.php b/dev/docker/oc10.config.php index 5edf59fc444..2eeaa57ca8b 100644 --- a/dev/docker/oc10.config.php +++ b/dev/docker/oc10.config.php @@ -2,5 +2,6 @@ $CONFIG = [ 'web.baseUrl' => 'http://host.docker.internal:8080/index.php/apps/web', 'web.rewriteLinks' => true, + 'sharing.showPublicLinkQuickAction' => true, ]; diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/CreateForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/CreateForm.vue index 7aa0058ffe9..71a2698fb31 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Links/CreateForm.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Links/CreateForm.vue @@ -182,7 +182,7 @@ export default { passwordEnforcedForRole() { const currentRole = this.availableRoleOptions.find(({ role }) => { - return this.link.role.label === role.label + return this.link.role.name === role.name }) const canRead = currentRole.role.hasPermission(SharePermissions.read) diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts index 9ee17ebac2b..107474f7a44 100644 --- a/packages/web-app-files/src/helpers/resources.ts +++ b/packages/web-app-files/src/helpers/resources.ts @@ -433,13 +433,11 @@ function _buildLink(link): Share { description = role.label } - let oc10QuickLink = false - if (link.attributes) { - const attributes = JSON.parse(link.attributes) || [] - oc10QuickLink = attributes.find((attr) => attr.key === 'isQuickLink')?.enabled - } - const ocisQuickLink = link.quicklink === 'true' - const quicklink = oc10QuickLink || ocisQuickLink + const quicklinkOc10 = + JSON.parse(link.attributes || '[]').find((attr) => attr.key === 'isQuickLink')?.enabled === + 'true' + const quicklinkOcis = link.quicklink === 'true' + const quicklink = quicklinkOc10 || quicklinkOcis return { shareType: parseInt(link.share_type), diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json index 9489b977b19..72e8d12baba 100644 --- a/packages/web-runtime/package.json +++ b/packages/web-runtime/package.json @@ -24,7 +24,7 @@ "marked": "^4.0.12", "oidc-client": "1.11.5", "owncloud-design-system": "^13.1.0-rc.5", - "owncloud-sdk": "~3.0.0-alpha.6", + "owncloud-sdk": "~3.0.0-alpha.7", "p-queue": "^6.1.1", "popper-max-size-modifier": "^0.2.0", "portal-vue": "^2.1.7", diff --git a/yarn.lock b/yarn.lock index 820c5103fd1..1ad3111eaf2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9811,9 +9811,9 @@ __metadata: languageName: node linkType: hard -"owncloud-sdk@npm:~3.0.0-alpha.6": - version: 3.0.0-alpha.6 - resolution: "owncloud-sdk@npm:3.0.0-alpha.6" +"owncloud-sdk@npm:~3.0.0-alpha.7": + version: 3.0.0-alpha.7 + resolution: "owncloud-sdk@npm:3.0.0-alpha.7" peerDependencies: axios: ^0.26.0 cross-fetch: ^3.0.6 @@ -9823,7 +9823,7 @@ __metadata: uuid: ^8.2.0 webdav: 4.9.0 xml-js: ^1.6.11 - checksum: 4f5d5e92f108ed2e1fa1145396cb29d2d6ff48737edb8de8e655e77d9960acccb1e5136451f681d9c731a95f94e37fd1b3abb0202d61e6724104bdece3052151 + checksum: 87ba4e2151ccbbb4a67aede7d0a366c7d55605b5e08649ac61d6b9a6f2223d53a2a9db86e69668a384af01c3f0fb871ef7361484df5ca08d7e2753118fef2495 languageName: node linkType: hard @@ -13933,7 +13933,7 @@ __metadata: marked: ^4.0.12 oidc-client: 1.11.5 owncloud-design-system: ^13.1.0-rc.5 - owncloud-sdk: ~3.0.0-alpha.6 + owncloud-sdk: ~3.0.0-alpha.7 p-queue: ^6.1.1 popper-max-size-modifier: ^0.2.0 portal-vue: ^2.1.7