Merge pull request #2907 from nextcloud/backport/2904/stable29

[stable29] Even more acl ux fixes
nextcloud · Apr 3, 2024 · c490e90 · c490e90
2 parents 981a743 + aa36662
commit c490e90
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/client.js b/src/client.js
@@ -228,6 +228,10 @@ class AclDavService {
 					inheritedAclsById[id] = acl
 					if (aclsById[id] == null) {
 						aclsById[id] = acl
+
+						aclsById[id].inheritedMask = acl.mask
+						aclsById[id].inheritedPermissions = acl.permissions
+						aclsById[id].mask = 0
 					} else {
 						aclsById[id].inheritedMask = acl.mask
 						aclsById[id].inheritedPermissions = acl.permissions

diff --git a/src/components/SharingSidebarView.vue b/src/components/SharingSidebarView.vue
@@ -133,12 +133,10 @@
 			</template>
 			{{ t('groupfolders', 'Add advanced permission rule') }}
 		</NcButton>
-		<NcSelect v-if="isAdmin && !loading"
-			v-show="showAclCreate"
+		<NcSelect v-if="isAdmin && !loading && showAclCreate"
 			ref="select"
 			v-model="value"
 			:options="options"
-			:clear-search-on-select="true"
 			:loading="isSearching"
 			:filterable="false"
 			:placeholder="t('groupfolders', 'Select a user or group')"
@@ -312,6 +310,7 @@ export default {
 			})
 		},
 		createAcl(option) {
+			this.value = null
 			const rule = new Rule()
 			rule.fromValues(option.type, option.id, option.displayname, 0b00000, 0b11111)
 			this.list.push(rule)