hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #4459

Browse Source
v1.18.x
psychobunny 9 years ago
parent a9cc12c667
commit f277c66089
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
src/controllers/accounts/helpers.js
Unescape Escape View File

@ -58,7 +58,7 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
var userSettings = results.userSettings; var userSettings = results.userSettings;
var isAdmin = results.isAdmin; var isAdmin = results.isAdmin;
var isGlobalModerator = results.isGlobalModerator; var isGlobalModerator = results.isGlobalModerator;
var self = parseInt(callerUID, 10) === parseInt(userData.uid, 10); var isSelf = parseInt(callerUID, 10) === parseInt(userData.uid, 10);
userData.joindateISO = utils.toISOString(userData.joindate); userData.joindateISO = utils.toISOString(userData.joindate);
userData.lastonlineISO = utils.toISOString(userData.lastonline || userData.joindate); userData.lastonlineISO = utils.toISOString(userData.lastonline || userData.joindate);
@ -66,17 +66,17 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
userData.emailClass = 'hide'; userData.emailClass = 'hide';
if (!(isAdmin || isGlobalModerator || self || (userData.email && userSettings.showemail))) { if (!(isAdmin || isGlobalModerator || isSelf || (userData.email && userSettings.showemail))) {
userData.email = ''; userData.email = '';
} else if (!userSettings.showemail) { } else if (!userSettings.showemail) {
userData.emailClass = ''; userData.emailClass = '';
} }
if (!isAdmin && !isGlobalModerator && !self && !userSettings.showfullname) { if (!isAdmin && !isGlobalModerator && !isSelf && !userSettings.showfullname) {
userData.fullname = ''; userData.fullname = '';
} }
if (isAdmin || isGlobalModerator || self) { if (isAdmin || isGlobalModerator || isSelf) {
userData.ips = results.ips; userData.ips = results.ips;
} }
@ -86,15 +86,15 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
userData.isAdmin = isAdmin; userData.isAdmin = isAdmin;
userData.isGlobalModerator = isGlobalModerator; userData.isGlobalModerator = isGlobalModerator;
userData.canBan = isAdmin || isGlobalModerator; userData.canBan = isAdmin || isGlobalModerator;
userData.canChangePassword = isAdmin || self; userData.canChangePassword = isAdmin || (isSelf && parseInt(meta.config['password:disableEdit'], 10) !== 1);
userData.isSelf = self; userData.isSelf = isSelf;
userData.showHidden = self || isAdmin || isGlobalModerator; userData.showHidden = isSelf || isAdmin || isGlobalModerator;
userData.groups = Array.isArray(results.groups) && results.groups.length ? results.groups[0] : []; userData.groups = Array.isArray(results.groups) && results.groups.length ? results.groups[0] : [];
userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
userData['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1; userData['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
userData['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1; userData['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10); userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10);
userData.profile_links = filterLinks(results.profile_links, self); userData.profile_links = filterLinks(results.profile_links, isSelf);
userData.sso = results.sso.associations; userData.sso = results.sso.associations;
userData.status = user.getStatus(userData); userData.status = user.getStatus(userData);
userData.banned = parseInt(userData.banned, 10) === 1; userData.banned = parseInt(userData.banned, 10) === 1;

6
src/views/admin/settings/user.tpl
Unescape Escape View File

@ -72,6 +72,12 @@
<span class="mdl-switch__label"><strong>Disable email changes</strong></span> <span class="mdl-switch__label"><strong>Disable email changes</strong></span>
</label> </label>
</div> </div>
<div class="checkbox">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" data-field="password:disableEdit">
<span class="mdl-switch__label"><strong>Disable password changes</strong></span>
</label>
</div>
<div class="checkbox"> <div class="checkbox">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect"> <label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" data-field="allowAccountDelete" checked> <input class="mdl-switch__input" type="checkbox" data-field="allowAccountDelete" checked>

Write Preview
Loading…
Cancel
Save