Merge pull request #2906 from nextcloud/backport/2904/stable28

[stable28] Even more acl ux fixes

Author: icewind1991

appinfo/info.xml

@@ -10,7 +10,7 @@ Folders can be configured from *Group folders* in the admin settings.
 After a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.
 
 Note: Encrypting the contents of group folders is currently not supported.]]></description>
-	<version>16.0.5</version>
+	<version>16.0.6</version>
 	<licence>agpl</licence>
 	<author>Robin Appelman</author>
 	<namespace>GroupFolders</namespace>

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

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)