From ff88ab24247b784e8410a24e6c883ada8123e3c7 Mon Sep 17 00:00:00 2001
From: Alexandre Arias <apa13@inf.ufpr.br>
Date: Wed, 21 Oct 2015 12:00:05 -0200
Subject: [PATCH] create delete button, change buttons order
Signed-off-by: Alexandre Arias <apa13@inf.ufpr.br>
---
app/controllers/management/users_controller.rb | 8 ++++++--
app/views/management/users/_checkbox.html.erb | 1 -
app/views/management/users/admins.html.erb | 5 ++---
app/views/management/users/curators.html.erb | 5 ++---
app/views/management/users/index.html.erb | 3 +--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb
index 635e499c..f593f419 100644
--- a/app/controllers/management/users_controller.rb
+++ b/app/controllers/management/users_controller.rb
@@ -58,6 +58,11 @@ class Management::UsersController < ManagementController
end
end
+ def change_roles
+ @user User.find_by(id:,params[:user])
+ @user.roles = params[:roles]
+ end
+
private
# Use callbacks to share common setup or constraints between actions.
@@ -72,8 +77,7 @@ class Management::UsersController < ManagementController
def set_roles
@roles = Role.all
- @user = params[:user]
- @user.roles = params[:roles]
+
end
end
diff --git a/app/views/management/users/_checkbox.html.erb b/app/views/management/users/_checkbox.html.erb
index 3850caca..8545ada1 100644
--- a/app/views/management/users/_checkbox.html.erb
+++ b/app/views/management/users/_checkbox.html.erb
@@ -4,7 +4,6 @@
<div class="ls-label " >
-
<%= f.collection_radio_buttons :role, @roles, :role, :role do |r| %>
<div class="radio" >
<%= f.radio_button :role, r.text %>
diff --git a/app/views/management/users/admins.html.erb b/app/views/management/users/admins.html.erb
index 766d5d26..55a678bc 100644
--- a/app/views/management/users/admins.html.erb
+++ b/app/views/management/users/admins.html.erb
@@ -41,7 +41,7 @@
</thead>
<tbody>
- <% @admins = @users.all.find_by(:role,"admin")
+ <% @admins = @users.all.find_by (role:,"admin") %>
<% @admins.each do |a| %>
<tr>
<td>
@@ -59,12 +59,11 @@
</td>
<td class="ls-txt-right ls-regroup">
<%= link_to 'Administrar', edit_management_user_path(a), {class: 'ls-btn ls-btn-sm', aria: {expanded: false}, role: 'combobox'} %>
- <%= render 'checkbox' %>
+ <%= link_to 'Excluir', management_user_path(a), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir?'}, title: 'Apagar usuário', class: 'ls-color-danger', role: 'option'} %>
<div data-ls-module="dropdown" class="ls-dropdown ls-pos-right">
<a href="#" class="ls-btn ls-btn-sm" aria-expanded="false" role="combobox"></a>
<ul class="ls-dropdown-nav" aria-hidden="true">
<%= render 'checkbox'%>
- <%= link_to 'Excluir', management_user_path(a), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir?'}, title: 'Apagar usuário', class: 'ls-color-danger', role: 'option'} %>
</ul>
</div>
diff --git a/app/views/management/users/curators.html.erb b/app/views/management/users/curators.html.erb
index 742f2b58..f503d84b 100644
--- a/app/views/management/users/curators.html.erb
+++ b/app/views/management/users/curators.html.erb
@@ -41,7 +41,7 @@
</thead>
<tbody>
- <% @curators = @users.all.find_by(:role,"curator")
+ <% @curators = @users.all.find_by(role:,"curator") %>
<% @curators.each do |c| %>
<tr>
<td>
@@ -59,12 +59,11 @@
</td>
<td class="ls-txt-right ls-regroup">
<%= link_to 'Administrar', edit_management_user_path(c), {class: 'ls-btn ls-btn-sm', aria: {expanded: false}, role: 'combobox'} %>
- <%= render 'checkbox' %>
+ <%= link_to 'Excluir', management_user_path(c), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir?'}, title: 'Apagar usuário', class: 'ls-color-danger', role: 'option'} %>
<div data-ls-module="dropdown" class="ls-dropdown ls-pos-right">
<a href="#" class="ls-btn ls-btn-sm" aria-expanded="false" role="combobox"></a>
<ul class="ls-dropdown-nav" aria-hidden="true">
<%= render 'checkbox'%>
- <%= link_to 'Excluir', management_user_path(c), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir?'}, title: 'Apagar usuário', class: 'ls-color-danger', role: 'option'} %>
</ul>
</div>
diff --git a/app/views/management/users/index.html.erb b/app/views/management/users/index.html.erb
index c9143063..601d75e1 100644
--- a/app/views/management/users/index.html.erb
+++ b/app/views/management/users/index.html.erb
@@ -58,12 +58,11 @@
</td>
<td class="ls-txt-right ls-regroup">
<%= link_to 'Administrar', edit_management_user_path(u), {class: 'ls-btn ls-btn-sm', aria: {expanded: false}, role: 'combobox'} %>
-
+ <%= link_to 'Excluir', management_user_path(u), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir?'}, title: 'Apagar usuário', class: 'ls-color-danger', role: 'option'} %>
<div data-ls-module="dropdown" class="ls-dropdown ls-pos-right">
<a href="#" class="ls-btn ls-btn-sm" aria-expanded="false" role="combobox"></a>
<ul class="ls-dropdown-nav" aria-hidden="true">
<%= render 'checkbox'%>
- <%= link_to 'Excluir', management_user_path(u), {method: :delete, data: {confirm: 'Tem certeza que deseja excluir?'}, title: 'Apagar usuário', class: 'ls-color-danger', role: 'option'} %>
</ul>
</div>
--
GitLab