From d6d0b9aad9f183e650df899c4ac9f118899d696f Mon Sep 17 00:00:00 2001
From: Alexandre Arias <apa13@inf.ufpr.br>
Date: Mon, 9 Nov 2015 11:57:43 -0200
Subject: [PATCH] fix users infos
Signed-off-by: Alexandre Arias <apa13@inf.ufpr.br>
---
app/views/management/users/_form.html.erb | 4 ++--
app/views/management/users/admins.html.erb | 3 ++-
app/views/management/users/curators.html.erb | 3 ++-
app/views/management/users/edit.html.erb | 3 ---
app/views/management/users/index.html.erb | 9 ++++++---
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/app/views/management/users/_form.html.erb b/app/views/management/users/_form.html.erb
index 3efc7e93d..4f8d70fd4 100644
--- a/app/views/management/users/_form.html.erb
+++ b/app/views/management/users/_form.html.erb
@@ -54,7 +54,7 @@
<div class="ls-actions-btn">
<button class="ls-btn">Salvar</button>
- <button class="ls-btn-danger">Cancelar</button>
+ <%= link_to "Cancelar", :back, class:"ls-btn-danger"%>
</div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/management/users/admins.html.erb b/app/views/management/users/admins.html.erb
index 9bcef5662..71642909a 100644
--- a/app/views/management/users/admins.html.erb
+++ b/app/views/management/users/admins.html.erb
@@ -58,7 +58,8 @@
<span class="ls-tag hidden-xs"><%= c.roles[0].name %></span>
</td>
<td class="ls-txt-center hidden-xs">Ativo
- <small class="ls-display-block">último acesso <%= c.last_sign_in_at %></small>
+ <small class="ls-display-block">Último acesso <%= c.current_sign_in_at.to_date %></small>
+ <small class="ls-display-block">Total de acessos <%= c.sign_in_count %></small>
</td>
<td class="ls-txt-center">
<%= c.email %>
diff --git a/app/views/management/users/curators.html.erb b/app/views/management/users/curators.html.erb
index 7e8f6f083..4570141c8 100644
--- a/app/views/management/users/curators.html.erb
+++ b/app/views/management/users/curators.html.erb
@@ -58,7 +58,8 @@
<span class="ls-tag hidden-xs"><%= c.roles[0].name %></span>
</td>
<td class="ls-txt-center hidden-xs">Ativo
- <small class="ls-display-block">último acesso <%= c.last_sign_in_at %></small>
+ <small class="ls-display-block">Último acesso <%= c.current_sign_in_at.to_date %></small>
+ <small class="ls-display-block">Total de acessos <%= c.sign_in_count %></small>
</td>
<td class="ls-txt-center">
<%= c.email %>
diff --git a/app/views/management/users/edit.html.erb b/app/views/management/users/edit.html.erb
index 40748f668..4acb9b135 100644
--- a/app/views/management/users/edit.html.erb
+++ b/app/views/management/users/edit.html.erb
@@ -6,6 +6,3 @@
</ol>
<%= render 'form' %>
-
-
-<%= debug @user %>
diff --git a/app/views/management/users/index.html.erb b/app/views/management/users/index.html.erb
index 9cdbe55d7..7a588dd74 100644
--- a/app/views/management/users/index.html.erb
+++ b/app/views/management/users/index.html.erb
@@ -50,9 +50,12 @@
<span class="ls-tag hidden-xs"><%= r.name %></span>
<% end %>
</td>
- <td class="ls-txt-center hidden-xs">Ativo
- <small class="ls-display-block">último acesso <%= u.last_sign_in_at %></small>
- </td>
+
+ <td class="ls-txt-center hidden-xs">Ativo em
+ <small class="ls-display-block">Último acesso <%= u.current_sign_in_at.to_date %></small>
+ <small class="ls-display-block">Total de acessos <%= u.sign_in_count %></small>
+ </td>
+
<td class="ls-txt-center">
<%= u.email %>
</td>
--
GitLab