From e23e28b3cc311c9820462b38c6a7958027540dd7 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Tue, 15 May 2018 18:22:19 +0200 Subject: Various fixes * Fixed subadmin group management * Fixed pass policy prop retrieving * Fixed fields subadmins were not supposed to see MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- settings/src/store/users.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'settings/src/store/users.js') diff --git a/settings/src/store/users.js b/settings/src/store/users.js index 052a2918390..f349c7b4a06 100644 --- a/settings/src/store/users.js +++ b/settings/src/store/users.js @@ -213,9 +213,11 @@ const actions = { getPasswordPolicyMinLength(context) { - return api.get(OC.linkToOCS('apps/provisioning_api/api/v1/config/apps/password_policy/minLength', 2)) - .then((response) => context.commit('setPasswordPolicyMinLength', response.data.ocs.data.data)) - .catch((error) => context.commit('API_FAILURE', error)); + if(oc_capabilities.password_policy && oc_capabilities.password_policy.minLength) { + context.commit('setPasswordPolicyMinLength', oc_capabilities.password_policy.minLength); + return oc_capabilities.password_policy.minLength; + } + return false; }, /** @@ -344,12 +346,12 @@ const actions = { * @param {string} options.quota User email * @returns {Promise} */ - addUser({context, dispatch}, { userid, password, email, groups, subadmin, quota, language }) { + addUser({commit, dispatch}, { userid, password, email, groups, subadmin, quota, language }) { return api.requireAdmin().then((response) => { return api.post(OC.linkToOCS(`cloud/users`, 2), { userid, password, email, groups, subadmin, quota, language }) .then((response) => dispatch('addUserData', userid)) .catch((error) => {throw error;}); - }).catch((error) => context.commit('API_FAILURE', { userid, error })); + }).catch((error) => commit('API_FAILURE', { userid, error })); }, /** -- cgit v1.2.3