From 3a2deb00399eb213472ef169826bd15ad655e490 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 24 Feb 2021 18:31:44 +0200 Subject: [PATCH] Admin Panel/People/People/New User: Added Initials. Thanks to xet7 ! --- client/components/settings/peopleBody.jade | 5 ++++- client/components/settings/peopleBody.js | 2 ++ models/users.js | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade index b4c41c406..7cb196973 100644 --- a/client/components/settings/peopleBody.jade +++ b/client/components/settings/peopleBody.jade @@ -332,7 +332,7 @@ template(name="editUserPopup") input.js-profile-fullname(type="text" value=user.profile.fullname required) label | {{_ 'initials'}} - input.js-profile-initials(type="text" value=user.profile.initials) + input.js-profile-initials(type="text" value=user.profile.initials required) label | {{_ 'admin'}} select.select-role.js-profile-isadmin @@ -436,6 +436,9 @@ template(name="newUserPopup") // input.js-profile-username(type="text" value=user.username readonly) //else input.js-profile-username(type="text" value="" required) + label + | {{_ 'initials'}} + input.js-profile-initials(type="text" value="" required) label | {{_ 'email'}} span.error.hide.email-taken diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index f2846f440..65427c726 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -654,6 +654,7 @@ Template.newUserPopup.events({ event.preventDefault(); const fullname = templateInstance.find('.js-profile-fullname').value.trim(); const username = templateInstance.find('.js-profile-username').value.trim(); + const initials = templateInstance.find('.js-profile-initials').value.trim(); const password = templateInstance.find('.js-profile-password').value; const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim(); const isActive = templateInstance.find('.js-profile-isactive').value.trim(); @@ -666,6 +667,7 @@ Template.newUserPopup.events({ 'setCreateUser', fullname, username, + initials, password, isAdmin, isActive, diff --git a/models/users.js b/models/users.js index f2a98c1b5..c88572af0 100644 --- a/models/users.js +++ b/models/users.js @@ -800,6 +800,7 @@ if (Meteor.isServer) { setCreateUser( fullname, username, + initials, password, isAdmin, isActive, @@ -809,6 +810,7 @@ if (Meteor.isServer) { if (Meteor.user() && Meteor.user().isAdmin) { check(fullname, String); check(username, String); + check(initials, String); check(password, String); check(isAdmin, String); check(isActive, String); @@ -833,7 +835,11 @@ if (Meteor.isServer) { const user = Users.findOne(username) || Users.findOne({ username }); if (user) { Users.update(user._id, { - $set: { 'profile.fullname': fullname, importUsernames }, + $set: { + 'profile.fullname': fullname, + importUsernames, + 'profile.initials': initials, + }, }); } }