Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #4060 - Error on second migration of an microsoft365 channel undefined method `options' for nil:NilClass.

Browse source
This commit is contained in:
Rolf Schmidt 2022-04-19 09:45:53 +02:00
parent bc7494dde2
commit 545289c29b
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
View file

@ -95,8 +95,12 @@ class ChannelAccountOverview extends App.ControllerSubContent
channels.push channel channels.push channel
# auto redirect to gmail account linking if we have no account # on a channel migration we need to auto redirect
if @channel_id && channels.length < 1 # the user to the "Add Account" functionality after
# the filled up the external credentials
if @channel_id
item = App.Channel.find(@channel_id)
if item && item.area != 'Microsoft365::Account'
@new() @new()
return return
@ -111,9 +115,14 @@ class ChannelAccountOverview extends App.ControllerSubContent
not_used_email_addresses: not_used_email_addresses not_used_email_addresses: not_used_email_addresses
) )
# on a channel creation we will auto open the edit
# dialog after the redirect back to zammad to optional
# change the inbound configuration, but not for
# migrated channel because we guess that the inbound configuration
# is already correct for them.
if @channel_id if @channel_id
item = App.Channel.find(@channel_id) item = App.Channel.find(@channel_id)
if item && item.options && item.options.backup_imap_classic is undefined if item && item.area == 'Microsoft365::Account' && item.options && item.options.backup_imap_classic is undefined
@editInbound(undefined, @channel_id, true) @editInbound(undefined, @channel_id, true)
@channel_id = undefined @channel_id = undefined