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

Some small improvements to email channel management.

Browse source
This commit is contained in:
Martin Edenhofer 2015-08-30 01:31:11 +02:00
parent ad732e298c
commit a009cb0935
3 changed files with 85 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/controllers/_channel/email.js.coffee
View file

@ -236,12 +236,12 @@ class App.ChannelEmailAccountOverview extends App.Controller
success: (data, status, xhr) => success: (data, status, xhr) =>
# load assets # load assets
App.Collection.loadAssets( data.assets ) App.Collection.loadAssets(data.assets)
@render() @render(accounts_fixed: data.accounts_fixed)
) )
render: => render: (params = {}) =>
# get channels # get channels
channels = App.Channel.search( filter: { area: 'Email::Account' } ) channels = App.Channel.search( filter: { area: 'Email::Account' } )
@ -263,6 +263,7 @@ class App.ChannelEmailAccountOverview extends App.Controller
channels: channels channels: channels
email_addresses_not_used: email_addresses_not_used email_addresses_not_used: email_addresses_not_used
channel: channel channel: channel
accounts_fixed: params.accounts_fixed
) )
wizard: (e) => wizard: (e) =>

19
app/assets/javascripts/app/views/channel/email_account_overview.jst.eco
View file

@ -1,5 +1,14 @@
<h1><%- @T('Email Accounts') %></h1> <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 %>&lt;<%= email_address.email %>&gt;
<% end %>
</ul>
<% end %>
<% if !_.isEmpty(@email_addresses_not_used): %> <% if !_.isEmpty(@email_addresses_not_used): %>
<h2><%- @T('Not linked email addresses') %></h2> <h2><%- @T('Not linked email addresses') %></h2>
<ul> <ul>
@ -9,7 +18,10 @@
</ul> </ul>
<% end %> <% end %>
<table class="table table-hover user-list"> <% if _.isEmpty(@channels): %>
<p><%- @T('You have no configured account right now.') %></p>
<% else: %>
<table class="table table-hover user-list">
<thead> <thead>
<tr> <tr>
<th><%- @T('Inbound') %></th> <th><%- @T('Inbound') %></th>
@ -63,9 +75,10 @@
<td colspan="4"><%= channel.last_log_out %></td> <td colspan="4"><%= channel.last_log_out %></td>
</tr> </tr>
<% end %> <% end %>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<% end %>
<a data-type="new" class="btn btn--success"><%- @T('New') %></a> <a data-type="new" class="btn btn--success"><%- @T('New') %></a>

14
app/controllers/channels_controller.rb
View file

@ -217,17 +217,25 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
def email_index def email_index
return if deny_if_not_role(Z_ROLENAME_ADMIN) return if deny_if_not_role(Z_ROLENAME_ADMIN)
system_online_service = Setting.get('system_online_service') system_online_service = Setting.get('system_online_service')
accounts_fixed = []
assets = {} assets = {}
Channel.all.each {|channel| 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) assets = channel.assets(assets)
} }
EmailAddress.all.each {|email_address| 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) assets = email_address.assets(assets)
} }
render json: { render json: {
assets: assets accounts_fixed: accounts_fixed,
assets: assets,
} }
end end