Some small improvements to email channel management.
This commit is contained in:
parent
ad732e298c
commit
a009cb0935
3 changed files with 85 additions and 63 deletions
|
@ -238,10 +238,10 @@ class App.ChannelEmailAccountOverview extends App.Controller
|
|||
# load assets
|
||||
App.Collection.loadAssets(data.assets)
|
||||
|
||||
@render()
|
||||
@render(accounts_fixed: data.accounts_fixed)
|
||||
)
|
||||
|
||||
render: =>
|
||||
render: (params = {}) =>
|
||||
|
||||
# get channels
|
||||
channels = App.Channel.search( filter: { area: 'Email::Account' } )
|
||||
|
@ -263,6 +263,7 @@ class App.ChannelEmailAccountOverview extends App.Controller
|
|||
channels: channels
|
||||
email_addresses_not_used: email_addresses_not_used
|
||||
channel: channel
|
||||
accounts_fixed: params.accounts_fixed
|
||||
)
|
||||
|
||||
wizard: (e) =>
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
<h1><%- @T('Email Accounts') %></h1>
|
||||
|
||||
<% if @accounts_fixed: %>
|
||||
<h2><%- @T('Fixed email addresses') %></h2>
|
||||
<ul>
|
||||
<% for email_address in @accounts_fixed: %>
|
||||
<li><%= email_address.realname %><<%= email_address.email %>>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
||||
<% if !_.isEmpty(@email_addresses_not_used): %>
|
||||
<h2><%- @T('Not linked email addresses') %></h2>
|
||||
<ul>
|
||||
|
@ -9,6 +18,9 @@
|
|||
</ul>
|
||||
<% end %>
|
||||
|
||||
<% if _.isEmpty(@channels): %>
|
||||
<p><%- @T('You have no configured account right now.') %></p>
|
||||
<% else: %>
|
||||
<table class="table table-hover user-list">
|
||||
<thead>
|
||||
<tr>
|
||||
|
@ -66,6 +78,7 @@
|
|||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end %>
|
||||
|
||||
<a data-type="new" class="btn btn--success"><%- @T('New') %></a>
|
||||
|
||||
|
|
|
@ -217,17 +217,25 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
|
|||
def email_index
|
||||
return if deny_if_not_role(Z_ROLENAME_ADMIN)
|
||||
system_online_service = Setting.get('system_online_service')
|
||||
accounts_fixed = []
|
||||
assets = {}
|
||||
Channel.all.each {|channel|
|
||||
next if system_online_service && channel.preferences && channel.preferences[:online_service_disable]
|
||||
if system_online_service && channel.preferences && channel.preferences['online_service_disable']
|
||||
email_addresses = EmailAddress.where(channel_id: channel.id)
|
||||
email_addresses.each {|email_address|
|
||||
accounts_fixed.push email_address
|
||||
}
|
||||
next
|
||||
end
|
||||
assets = channel.assets(assets)
|
||||
}
|
||||
EmailAddress.all.each {|email_address|
|
||||
next if system_online_service && email_address.preferences && email_address.preferences[:online_service_disable]
|
||||
next if system_online_service && email_address.preferences && email_address.preferences['online_service_disable']
|
||||
assets = email_address.assets(assets)
|
||||
}
|
||||
render json: {
|
||||
assets: assets
|
||||
accounts_fixed: accounts_fixed,
|
||||
assets: assets,
|
||||
}
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue