summaryrefslogtreecommitdiffstats
path: root/settings/src/views
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-04-20 17:29:42 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-05-16 09:50:22 +0200
commit72a76060bf83ea841bea4037e29b5bf11879a955 (patch)
tree6abb94e81c8e3f37761ecc3a22cf5c2d6c66e5cb /settings/src/views
parent0e5b0fcef0d63b4d4c6e3c5f0125b76d8c0088aa (diff)
downloadnextcloud-server-72a76060bf83ea841bea4037e29b5bf11879a955.tar.gz
nextcloud-server-72a76060bf83ea841bea4037e29b5bf11879a955.zip
Fixed settings menu entry and group deletion
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/src/views')
-rw-r--r--settings/src/views/Users.vue12
1 files changed, 6 insertions, 6 deletions
diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue
index d0e5591cd0c..fcf41e72efc 100644
--- a/settings/src/views/Users.vue
+++ b/settings/src/views/Users.vue
@@ -63,7 +63,7 @@ export default {
orderBy: this.$store.getters.getServerData.sortGroups,
userCount: this.$store.getters.getServerData.userCount
});
- this.$store.dispatch('getPasswordPolicyMinLength');
+ //this.$store.dispatch('getPasswordPolicyMinLength');
},
data() {
return {
@@ -241,7 +241,7 @@ export default {
item.utils.actions = [{
icon: 'icon-delete',
text: t('settings', 'Remove group'),
- action: function() {self.removeGroup(item.id)}
+ action: function() {self.removeGroup(group.id)}
}];
};
return item;
@@ -249,12 +249,12 @@ export default {
// Adjust data
let adminGroup = groups.find(group => group.id == 'admin');
- let disabledGroupIndex = groups.findIndex(group => group.id == 'disabled');
- let disabledGroup = groups[disabledGroupIndex];
- if (adminGroup.text) {
+ let disabledGroupIndex = groups.findIndex(group => group.id == 'disabled');
+ let disabledGroup = groups[disabledGroupIndex];
+ if (adminGroup && adminGroup.text) {
adminGroup.text = t('settings', 'Admins'); // rename admin group
}
- if (disabledGroup.text) {
+ if (disabledGroup && disabledGroup.text) {
disabledGroup.text = t('settings', 'Disabled users'); // rename disabled group
if (disabledGroup.utils.counter === 0) {
groups.splice(disabledGroupIndex, 1); // remove disabled if empty