diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2019-06-21 11:08:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 11:08:59 +0200 |
| commit | c1eff72bdf91df623bb377967270befd5c1594f9 (patch) | |
| tree | ec79e8297f225212bebbf3ef64b1e2e6106f937f /settings/src | |
| parent | 08734326da2bf8aef1856129ac547e6d4358d805 (diff) | |
| parent | 29449f85b688deb1f103f3f67993475a040b4d80 (diff) | |
| download | nextcloud-server-c1eff72bdf91df623bb377967270befd5c1594f9.tar.gz nextcloud-server-c1eff72bdf91df623bb377967270befd5c1594f9.zip | |
Merge pull request #15964 from nextcloud/enh/noid/user-creation-options
Opt-in for generation userid, requiring email addresses
Diffstat (limited to 'settings/src')
| -rw-r--r-- | settings/src/components/userList.vue | 11 | ||||
| -rw-r--r-- | settings/src/store/users.js | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue index 27a5e520897..b49de958d0a 100644 --- a/settings/src/components/userList.vue +++ b/settings/src/components/userList.vue @@ -49,9 +49,12 @@ <div :class="loading.all?'icon-loading-small':'icon-add'"></div> <div class="name"> <input id="newusername" type="text" required v-model="newUser.id" - :placeholder="t('settings', 'Username')" name="username" - autocomplete="off" autocapitalize="none" autocorrect="off" - ref="newusername" pattern="[a-zA-Z0-9 _\.@\-']+"> + :placeholder="this.settings.newUserGenerateUserID + ? t('settings', 'Will be autogenerated') + : t('settings', 'Username')" + name="username" autocomplete="off" autocapitalize="none" + autocorrect="off" ref="newusername" pattern="[a-zA-Z0-9 _\.@\-']+" + :disabled="this.settings.newUserGenerateUserID"> </div> <div class="displayName"> <input id="newdisplayname" type="text" v-model="newUser.displayName" @@ -67,7 +70,7 @@ </div> <div class="mailAddress"> <input id="newemail" type="email" v-model="newUser.mailAddress" - :required="newUser.password===''" + :required="newUser.password==='' || this.settings.newUserRequireEmail" :placeholder="t('settings', 'Email')" name="email" autocomplete="off" autocapitalize="none" autocorrect="off"> </div> diff --git a/settings/src/store/users.js b/settings/src/store/users.js index fcbd55e5cd7..6d8ecff5192 100644 --- a/settings/src/store/users.js +++ b/settings/src/store/users.js @@ -429,7 +429,7 @@ const actions = { addUser({commit, dispatch}, { userid, password, displayName, email, groups, subadmin, quota, language }) { return api.requireAdmin().then((response) => { return api.post(OC.linkToOCS(`cloud/users`, 2), { userid, password, displayName, email, groups, subadmin, quota, language }) - .then((response) => dispatch('addUserData', userid)) + .then((response) => dispatch('addUserData', userid || response.data.ocs.data.UserID)) .catch((error) => {throw error;}); }).catch((error) => { commit('API_FAILURE', { userid, error }); |