mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-20 15:30:39 +01:00
closes #3994
This commit is contained in:
@@ -1,15 +1,14 @@
|
||||
'use strict';
|
||||
|
||||
var async = require('async'),
|
||||
fs = require('fs'),
|
||||
nconf = require('nconf'),
|
||||
winston = require('winston'),
|
||||
var async = require('async');
|
||||
var fs = require('fs');
|
||||
var nconf = require('nconf');
|
||||
var winston = require('winston');
|
||||
|
||||
db = require('../../database'),
|
||||
user = require('../../user'),
|
||||
meta = require('../../meta'),
|
||||
helpers = require('../helpers'),
|
||||
accountHelpers = require('./helpers');
|
||||
var db = require('../../database');
|
||||
var user = require('../../user');
|
||||
var helpers = require('../helpers');
|
||||
var accountHelpers = require('./helpers');
|
||||
|
||||
var editController = {};
|
||||
|
||||
@@ -19,7 +18,6 @@ editController.get = function(req, res, callback) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
userData['username:disableEdit'] = !userData.isAdmin && parseInt(meta.config['username:disableEdit'], 10) === 1;
|
||||
userData.title = '[[pages:account/edit, ' + userData.username + ']]';
|
||||
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) {
|
||||
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.breadcrumbs = helpers.buildBreadcrumbs([
|
||||
@@ -74,7 +75,6 @@ function getUserData(req, next, callback) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
userData['username:disableEdit'] = parseInt(meta.config['username:disableEdit'], 10) === 1;
|
||||
userData.hasPassword = !!password;
|
||||
callback(null, userData);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user