Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #3994

Browse Source
This commit is contained in:
barisusakli
2015-12-25 10:19:15 +02:00
parent 300996b0d1
commit ac77f78d6b
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/controllers/accounts/edit.js
View File

@@ -1,15 +1,14 @@
'use strict'; 'use strict';
var async = require('async'), var async = require('async');
fs = require('fs'), var fs = require('fs');
nconf = require('nconf'), var nconf = require('nconf');
winston = require('winston'), var winston = require('winston');
db = require('../../database'), var db = require('../../database');
user = require('../../user'), var user = require('../../user');
meta = require('../../meta'), var helpers = require('../helpers');
helpers = require('../helpers'), var accountHelpers = require('./helpers');
accountHelpers = require('./helpers');
var editController = {}; var editController = {};
@@ -19,7 +18,6 @@ editController.get = function(req, res, callback) {
return callback(err); return callback(err);
} }
userData['username:disableEdit'] = !userData.isAdmin && parseInt(meta.config['username:disableEdit'], 10) === 1;
userData.title = '[[pages:account/edit, ' + userData.username + ']]'; userData.title = '[[pages:account/edit, ' + userData.username + ']]';
userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:edit]]'}]); userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:edit]]'}]);
@@ -44,6 +42,9 @@ function renderRoute(name, req, res, next) {
if (err) { if (err) {
return next(err); return next(err);
} }
if ((name === 'username' && userData['username:disableEdit']) || (name === 'email' && userData['email:disableEdit'])) {
return next();
}
userData.title = '[[pages:account/edit/' + name + ', ' + userData.username + ']]'; userData.title = '[[pages:account/edit/' + name + ', ' + userData.username + ']]';
userData.breadcrumbs = helpers.buildBreadcrumbs([ userData.breadcrumbs = helpers.buildBreadcrumbs([
@@ -74,7 +75,6 @@ function getUserData(req, next, callback) {
return callback(err); return callback(err);
} }
userData['username:disableEdit'] = parseInt(meta.config['username:disableEdit'], 10) === 1;
userData.hasPassword = !!password; userData.hasPassword = !!password;
callback(null, userData); callback(null, userData);
}); });

17
src/controllers/accounts/helpers.js
View File

@@ -1,15 +1,14 @@
'use strict'; 'use strict';
var async = require('async'), var async = require('async');
validator = require('validator'), var validator = require('validator');
nconf = require('nconf'),
user = require('../../user'), var user = require('../../user');
groups = require('../../groups'), var groups = require('../../groups');
plugins =require('../../plugins'), var plugins =require('../../plugins');
meta = require('../../meta'), var meta = require('../../meta');
utils = require('../../../public/src/utils'); var utils = require('../../../public/src/utils');
var helpers = {}; var helpers = {};
@@ -103,6 +102,8 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid); userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid);
userData['cover:position'] = userData['cover:position'] || '50% 50%'; userData['cover:position'] = userData['cover:position'] || '50% 50%';
userData['username:disableEdit'] = !userData.isAdmin && parseInt(meta.config['username:disableEdit'], 10) === 1;
userData['email:disableEdit'] = !userData.isAdmin && parseInt(meta.config['email:disableEdit'], 10) === 1;
next(null, userData); next(null, userData);
} }

4
src/socket.io/user/profile.js
View File

@@ -127,6 +127,10 @@ module.exports = function(SocketUser) {
data.username = oldUserData.username; data.username = oldUserData.username;
} }
if (!isAdmin && parseInt(meta.config['email:disableEdit'], 10) === 1) {
data.email = oldUserData.email;
}
user.updateProfile(data.uid, data, next); user.updateProfile(data.uid, data, next);
}, },
function (userData, next) { function (userData, next) {

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

@@ -66,6 +66,12 @@
<span class="mdl-switch__label"><strong>Disable username changes</strong></span> <span class="mdl-switch__label"><strong>Disable username 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="email:disableEdit">
<span class="mdl-switch__label"><strong>Disable email 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>