Adapt wording, change role name

owncloud · Sep 13, 2022 · ccca2e4 · ccca2e4
1 parent c5daa79
commit ccca2e4
Show file tree

Hide file tree

Showing 5 changed files with 197 additions and 181 deletions.
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
@@ -23,19 +23,12 @@ import Mixins from './mixins'
 import { mapActions, mapState } from 'vuex'
 import SideBar from './components/SideBar/SideBar.vue'
 import { defineComponent } from '@vue/composition-api'
-import { usePublicLinkPassword, useStore } from 'web-pkg/src/composables'
 
 export default defineComponent({
   components: {
     SideBar
   },
   mixins: [Mixins],
-  setup() {
-    const store = useStore()
-    return {
-      publicLinkPassword: usePublicLinkPassword({ store })
-    }
-  },
   computed: {
     ...mapState('Files/sidebar', {
       sidebarClosed: 'closed',

diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts
@@ -409,7 +409,7 @@ export function buildSharedResource(
     resource.canShare = () => true
     resource.canRename = () => true
     resource.canBeDeleted = () => true
-    resource.canDeny = () => SharePermissions.deny.enabled(share.permissions)
+    resource.canDeny = () => SharePermissions.denied.enabled(share.permissions)
   }
 
   resource.extension = extractExtensionFromFile(resource)

diff --git a/packages/web-app-files/src/helpers/share/permission.ts b/packages/web-app-files/src/helpers/share/permission.ts
@@ -55,7 +55,7 @@ export abstract class SharePermissions {
 
   static readonly share = new SharePermission('share', SharePermissionBit.Share, $gettext('Share'))
 
-  static readonly deny = new SharePermission('deny', 64, $gettext('Deny'))
+  static readonly denied = new SharePermission('denied', 64, $gettext('Deny'))
 
   static permissionsToBitmask(permissions: SharePermission[]): number {
     return (permissions || []).reduce((b: number, p: SharePermission) => b | p.bit, 0)

diff --git a/packages/web-app-files/src/helpers/share/role.ts b/packages/web-app-files/src/helpers/share/role.ts
@@ -173,11 +173,11 @@ export const peopleRoleCustomFolder = new CustomShareRole(
   ]
 )
 export const peopleRoleDenyFolder = new PeopleShareRole(
-  'deny',
+  'denied',
   true,
-  $gettext('Deny'),
-  $gettext('deny'),
-  [SharePermissions.deny]
+  $gettext('No access'),
+  $gettext('no access'),
+  [SharePermissions.denied]
 )
 export const linkRoleViewerFile = new LinkShareRole(
   'viewer',
@@ -221,9 +221,13 @@ export const linkRoleUploaderFolder = new LinkShareRole(
   $gettext('uploader'),
   [SharePermissions.create]
 )
-export const spaceRoleDeny = new SpaceShareRole('deny', false, $gettext('Deny'), $gettext('deny'), [
-  SharePermissions.deny
-])
+export const spaceRoleDeny = new SpaceShareRole(
+  'denied',
+  false,
+  $gettext('Deny'),
+  $gettext('deny'),
+  [SharePermissions.denied]
+)
 export const spaceRoleViewer = new SpaceShareRole(
   'viewer',
   false,