aboutsummaryrefslogtreecommitdiffstats
path: root/settings/src/components
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-04-09 11:03:21 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-05-16 09:50:21 +0200
commitf33065523d7850d0722282e42f15cae0504a7097 (patch)
treee4597aca4624f1d30f85b03fe1bd2a49530b15c4 /settings/src/components
parent6ada8254c9da63638f3b7e0cceaacf4254f43916 (diff)
downloadnextcloud-server-f33065523d7850d0722282e42f15cae0504a7097.tar.gz
nextcloud-server-f33065523d7850d0722282e42f15cae0504a7097.zip
Fixed tabs and Language support
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/src/components')
-rw-r--r--settings/src/components/userList.vue2
-rw-r--r--settings/src/components/userList/userRow.vue46
2 files changed, 23 insertions, 25 deletions
diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue
index 8069388d179..ed5be1f6adf 100644
--- a/settings/src/components/userList.vue
+++ b/settings/src/components/userList.vue
@@ -231,7 +231,7 @@ export default {
// revert form to original state
Object.assign(this.newUser, this.$options.data.call(this).newUser);
this.loading = false;
- },
+ },
createUser() {
this.loading = true;
this.$store.dispatch('addUser', {
diff --git a/settings/src/components/userList/userRow.vue b/settings/src/components/userList/userRow.vue
index 3feae9a7778..fe2637c6771 100644
--- a/settings/src/components/userList/userRow.vue
+++ b/settings/src/components/userList/userRow.vue
@@ -343,7 +343,7 @@ export default {
let userid = this.user.id;
let gid = group.id;
return this.$store.dispatch('addUserGroup', {userid, gid})
- .then(() => this.loading.groups = false);
+ .then(() => this.loading.groups = false);
},
/**
@@ -357,7 +357,7 @@ export default {
let userid = this.user.id;
let gid = group.id;
return this.$store.dispatch('removeUserGroup', {userid, gid})
- .then(() => this.loading.groups = false);
+ .then(() => this.loading.groups = false);
},
/**
@@ -371,7 +371,7 @@ export default {
let userid = this.user.id;
let gid = group.id;
return this.$store.dispatch('addUserSubAdmin', {userid, gid})
- .then(() => this.loading.subadmins = false);
+ .then(() => this.loading.subadmins = false);
},
/**
@@ -385,12 +385,11 @@ export default {
let userid = this.user.id;
let gid = group.id;
return this.$store.dispatch('removeUserSubAdmin', {userid, gid})
- .then(() => this.loading.subadmins = false);
+ .then(() => this.loading.subadmins = false);
},
-
/**
- * Validate quota string to make sure it's a valid human file size
+ * Dispatch quota set request
*
* @param {string|Object} quota Quota in readable format '5 GB' or Object {id: '5 GB', label: '5GB'}
* @returns {string}
@@ -407,24 +406,6 @@ export default {
return quota;
},
-
- /**
- * Validate quota string to make sure it's a valid human file size
- *
- * @param {string|Object} quota Quota in readable format '5 GB' or Object {id: '5 GB', label: '5GB'}
- * @returns {string}
- */
- setUserLanguage(lang) {
- this.loading.languages = true;
- // ensure we only send the preset id
- this.$store.dispatch('setUserData', {
- userid: this.user.id,
- key: 'language',
- value: lang.code
- }).then(() => this.loading.languages = false);
- return lang;
- },
-
/**
* Validate quota string to make sure it's a valid human file size
*
@@ -442,6 +423,23 @@ export default {
}
// if no valid doo not change
return false;
+ },
+
+ /**
+ * Dispatch language set request
+ *
+ * @param {Object} lang language object {code:'en', name:'English'}
+ * @returns {Object}
+ */
+ setUserLanguage(lang) {
+ this.loading.languages = true;
+ // ensure we only send the preset id
+ this.$store.dispatch('setUserData', {
+ userid: this.user.id,
+ key: 'language',
+ value: lang.code
+ }).then(() => this.loading.languages = false);
+ return lang;
}
}
}