Only update other avatars in one place
Prevent future mistakes
This commit is contained in:
parent
a71aa3fda2
commit
6730aae2dc
@ -35,8 +35,7 @@ class SettingsController < ApplicationController
|
||||
|
||||
if @user.avatar_new.present?
|
||||
if store_user_avatar
|
||||
LdapManager::UpdateAvatar.call(user: @user)
|
||||
XmppSetAvatarJob.perform_later(user: @user) if Setting.ejabberd_enabled?
|
||||
UserManager::UpdateAvatar.call(user: @user)
|
||||
else
|
||||
@validation_errors = @user.errors
|
||||
render :show, status: :unprocessable_entity and return
|
||||
|
@ -7,8 +7,7 @@ module UserManager
|
||||
|
||||
def call
|
||||
if import_remote_avatar
|
||||
LdapManager::UpdateAvatar.call(user: @user)
|
||||
XmppSetAvatarJob.perform_later(user: @user) if Setting.ejabberd_enabled?
|
||||
UserManager::UpdateAvatar.call(user: @user)
|
||||
end
|
||||
end
|
||||
|
||||
|
15
app/services/user_manager/update_avatar.rb
Normal file
15
app/services/user_manager/update_avatar.rb
Normal file
@ -0,0 +1,15 @@
|
||||
module UserManager
|
||||
class UpdateAvatar < UserManagerService
|
||||
def initialize(user:)
|
||||
@user = user
|
||||
end
|
||||
|
||||
def call
|
||||
LdapManager::UpdateAvatar.call(user: @user)
|
||||
|
||||
if Setting.ejabberd_enabled?
|
||||
XmppSetAvatarJob.perform_later(user: @user)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
x
Reference in New Issue
Block a user