Only show nickname edit options if nickname driver is enabled

This commit is contained in:
Alexander Skvortsov 2020-12-02 17:29:39 -05:00
parent f0a68617f7
commit bd307e4780
2 changed files with 18 additions and 3 deletions

View File

@ -11,19 +11,21 @@
namespace Flarum\Nicknames;
use Flarum\Api\Serializer\ForumSerializer;
use Flarum\Api\Serializer\UserSerializer;
use Flarum\Event\ConfigureUserGambits;
use Flarum\Extend;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\Event\Saving;
use Flarum\User\User;
use Flarum\User\UserValidator;
return [
(new Extend\Frontend('forum'))
->js(__DIR__.'/js/dist/forum.js'),
->js(__DIR__ . '/js/dist/forum.js'),
(new Extend\Frontend('admin'))
->js(__DIR__.'/js/dist/admin.js'),
->js(__DIR__ . '/js/dist/admin.js'),
(new Extend\User())
->displayNameDriver('nickname', NicknameDriver::class),
@ -36,11 +38,16 @@ return [
->listen(ConfigureUserGambits::class, SetUserNicknameGambit::class),
(new Extend\ApiSerializer(UserSerializer::class))
->attribute('canEditOwnNickname', function($serializer, $user) {
->attribute('canEditOwnNickname', function ($serializer, $user) {
$actor = $serializer->getActor();
return $actor->id === $user->id && $serializer->getActor()->can('editOwnNickname', $user);
}),
(new Extend\ApiSerializer(ForumSerializer::class))
->attribute('displayNameDriver', function ($serializer, $user) {
return app(SettingsRepositoryInterface::class)->get('display_name_driver', 'username');
}),
(new Extend\Validator(UserValidator::class))
->configure(AddNicknameValidation::class),

View File

@ -12,6 +12,8 @@ app.initializers.add('flarum/nicknames', () => {
User.prototype.canEditOwnNickname = Model.attribute('canEditOwnNickname');
extend(SettingsPage.prototype, 'accountItems', function (items) {
if (app.forum.attribute('displayNameDriver') !== 'nickname') return;
if (this.user.canEditOwnNickname()) {
items.add('changeNickname',
<Button className="Button" onclick={() => app.modal.show(NickNameModal)}>
@ -22,10 +24,14 @@ app.initializers.add('flarum/nicknames', () => {
});
extend(EditUserModal.prototype, 'oninit', function () {
if (app.forum.attribute('displayNameDriver') !== 'nickname') return;
this.nickname = Stream(this.attrs.user.displayName());
});
extend(EditUserModal.prototype, 'fields', function (items) {
if (app.forum.attribute('displayNameDriver') !== 'nickname') return;
items.add('nickname',
<div className="Form-group">
<label>{app.translator.trans('flarum-nicknames.forum.edit_user.nicknames_heading')}</label>
@ -36,6 +42,8 @@ app.initializers.add('flarum/nicknames', () => {
});
extend(EditUserModal.prototype, 'data', function (data) {
if (app.forum.attribute('displayNameDriver') !== 'nickname') return;
const user = this.attrs.user;
if (this.nickname() !== this.attrs.user.username()) {
data.nickname = this.nickname();