v1.18.x
barisusakli 10 years ago
parent 9d273d3a32
commit ffac8eb41d

@ -70,7 +70,7 @@ define('forum/account/settings', ['forum/account/header'], function(header) {
var setting = input.attr('data-property'); var setting = input.attr('data-property');
if (setting) { if (setting) {
if (input.is('select')) { if (input.is('select')) {
input.val(settings[setting]); input.val(settings[setting] || '');
return; return;
} }

@ -760,17 +760,18 @@ var async = require('async'),
tasks.push(async.apply(db.setAdd, 'group:' + groupName + ':owners', uid)); tasks.push(async.apply(db.setAdd, 'group:' + groupName + ':owners', uid));
} }
async.parallel(tasks, next); async.parallel(tasks, next);
} },
], function(err, results) { function(results, next) {
if (err) { user.setGroupTitle(groupName, uid, next);
return callback(err); },
} function(next) {
plugins.fireHook('action:group.join', { plugins.fireHook('action:group.join', {
groupName: groupName, groupName: groupName,
uid: uid uid: uid
}); });
callback(); next();
}); }
], callback);
} }
callback = callback || function() {}; callback = callback || function() {};

@ -143,4 +143,17 @@ module.exports = function(User) {
User.setSetting = function(uid, key, value, callback) { User.setSetting = function(uid, key, value, callback) {
db.setObjectField('user:' + uid + ':settings', key, value, callback); db.setObjectField('user:' + uid + ':settings', key, value, callback);
}; };
User.setGroupTitle = function(groupName, uid, callback) {
if (groupName === 'registered-users') {
return callback();
}
db.getObjectField('user:' + uid + ':settings', 'groupTitle', function(err, currentTitle) {
if (err || (currentTitle || currentTitle === '')) {
return callback(err);
}
User.setSetting(uid, 'groupTitle', groupName, callback);
});
};
}; };

Loading…
Cancel
Save