Small corrections

owncloud · Aug 16, 2022 · 57271fb · 57271fb
1 parent 3d8a11d
commit 57271fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -561,7 +561,8 @@ export default defineComponent({
         return LinkShareRoles.filterByBitmask(
           parseInt(this.share.permissions),
           this.highlightedFile.isFolder,
-          this.hasPublicLinkEditing
+          this.hasPublicLinkEditing,
+          !!link.password
         )
       }
 

diff --git a/packages/web-client/src/helpers/share/role.ts b/packages/web-client/src/helpers/share/role.ts
@@ -375,12 +375,17 @@ export abstract class LinkShareRoles {
    * @param bitmask
    * @param isFolder
    * @param canEditFile
+   * @param hasPassword
    */
-  static filterByBitmask(bitmask: number, isFolder: boolean, canEditFile = false): ShareRole[] {
+  static filterByBitmask(
+    bitmask: number,
+    isFolder: boolean,
+    canEditFile = false,
+    hasPassword = false
+  ): ShareRole[] {
     return [
       ...this.all,
-      linkRoleInternalFile,
-      linkRoleInternalFolder,
+      ...(!hasPassword ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
       ...(canEditFile ? [linkRoleEditorFile] : [])
     ].filter((r) => {
       return r.folder === isFolder && bitmask === (bitmask | r.bitmask(false))

diff --git a/packages/web-runtime/src/pages/resolvePublicLink.vue b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -29,8 +29,8 @@
           <p v-if="loadTokenInfoTask.isError" class="oc-text-lead">
             {{ loadTokenInfoTask.last.error }}
           </p>
-          <p v-if="loadTokenInfoTask.isError" class="oc-text-lead">
-            {{ loadTokenInfoTask.last.error }}
+          <p v-if="isPasswordRequiredTask.isError" class="oc-text-lead">
+            {{ isPasswordRequiredTask.last.error }}
           </p>
         </div>
       </template>