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

Improved ldap summary layout.

Browse source
This commit is contained in:
Martin Edenhofer 2017-04-19 14:41:16 +02:00
parent dc8de34473
commit 75bd61ce91
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco
View file

@ -23,8 +23,14 @@
<div class="flex"> <div class="flex">
<progress max="<%= @job.result.sum %>" value="<%= @countDone %>"></progress> <progress max="<%= @job.result.sum %>" value="<%= @countDone %>"></progress>
</div> </div>
<% end %>
<% end %>
<% if !_.isEmpty(@job.result): %>
<ul> <ul>
<li><%- @T('Users') %>: <%= @countDone %>/<%= @job.result.sum %> (<%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>) <li><%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @countDone %>/<%= @job.result.sum %>):
<ul>
<li><%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
</ul>
<% if !_.isEmpty(@job.result.roles): %> <% if !_.isEmpty(@job.result.roles): %>
<li><%- @T('%s groups to %s roles assignments', 'LDAP', 'Zammad') %>: <li><%- @T('%s groups to %s roles assignments', 'LDAP', 'Zammad') %>:
<ul> <ul>
@ -36,5 +42,4 @@
</ul> </ul>
<% end %> <% end %>
<% end %> <% end %>
<% end %>
</div> </div>

7
app/assets/javascripts/app/views/integration/ldap_summary.jst.eco
View file

@ -1,5 +1,9 @@
<ul> <ul>
<li><%- @T('Users') %>: <%= @countDone %> (<%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>) <li><%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @countDone %>):
<ul>
<li><%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
</ul>
</li>
<% if !_.isEmpty(@job.result.roles): %> <% if !_.isEmpty(@job.result.roles): %>
<li><%- @T('%s groups to %s roles assignments', 'LDAP', 'Zammad') %>: <li><%- @T('%s groups to %s roles assignments', 'LDAP', 'Zammad') %>:
<ul> <ul>
@ -7,5 +11,6 @@
<li><%- @T(role) %>: <%= result.created %> <%- @T('created') %>, <%= result.updated %> <%- @T('updated') %>, <%= result.unchanged %> <%- @T('untouched') %>, <%= result.failed %> <%- @T('failed') %> <li><%- @T(role) %>: <%= result.created %> <%- @T('created') %>, <%= result.updated %> <%- @T('updated') %>, <%= result.unchanged %> <%- @T('untouched') %>, <%= result.failed %> <%- @T('failed') %>
<% end %> <% end %>
</ul> </ul>
</li>
<% end %> <% end %>
</ul> </ul>