upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-05 06:44:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Merge pull request #10045 from nextcloud/groups-creation-fixes

Browse source 
Fix new group selection
This commit is contained in:
Morris Jobke 2018-06-29 12:55:53 +02:00 committed by GitHub
commit bff20585c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
settings/js/settings-vue.js
View file

File diff suppressed because one or more lines are too long

2
settings/js/settings-vue.js.map
View file

File diff suppressed because one or more lines are too long

8
settings/src/components/userList.vue
View file

@ -221,11 +221,11 @@ export default {
},
canAddGroups() {
// disabled if no permission to add new users to group
return this.groups.map((group) => {
return this.groups.map(group => {
// clone object because we don't want
// to edit the original groups
group = Object.assign({}, group);
group.$isDisabled = group.canAdd !== true;
group.$isDisabled = group.canAdd === false;
return group;
});
},
@ -235,7 +235,7 @@ export default {
},
quotaOptions() {
// convert the preset array into objects
let quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({id:cur, label:cur}), []);
let quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({id: cur, label: cur}), []);
// add default presets
quotaPreset.unshift(this.unlimitedQuota);
quotaPreset.unshift(this.defaultQuota);
@ -275,7 +275,7 @@ export default {
},
methods: {
onScroll(event) {
this.scrolled = event.target.scrollTop>0;
this.scrolled = event.target.scrollTo > 0;
},
/**

8
settings/src/components/userList/userRow.vue
View file

@ -206,9 +206,9 @@ export default {
// 1. user NOT in group but no permission to add
// 2. user is in group but no permission to remove
groupClone.$isDisabled =
(group.canAdd !== true &&
(group.canAdd === false &&
!this.user.groups.includes(group.id)) ||
(group.canRemove !== true &&
(group.canRemove === false &&
this.user.groups.includes(group.id));
return groupClone;
});
@ -405,7 +405,7 @@ export default {
* @returns {Promise}
*/
addUserGroup(group) {
if (!group.canAdd) {
if (group.canAdd === false) {
return false;
}
this.loading.groups = true;
@ -422,7 +422,7 @@ export default {
* @returns {Promise}
*/
removeUserGroup(group) {
if (!group.canRemove) {
if (group.canRemove === false) {
return false;
}
this.loading.groups = true;

4
settings/src/store/users.js
View file

@ -39,7 +39,9 @@ const defaults = {
id: '',
name: '',
usercount: 0,
disabled: 0
disabled: 0,
canAdd: true,
canRemove: true
}
};