diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb index f593f419cd9b9691a6a7218f312a7591e29fd408..82007a56b95ca90c97d3a9e694e8874bf4da1aa7 100644 --- a/app/controllers/management/users_controller.rb +++ b/app/controllers/management/users_controller.rb @@ -25,6 +25,7 @@ class Management::UsersController < ManagementController # POST /users.json def create @user = User.new(user_params) + @user.roles.ids = Role.all.ids respond_to do |format| if user_repository.save @user @@ -59,10 +60,10 @@ class Management::UsersController < ManagementController end def change_roles - @user User.find_by(id:,params[:user]) + @user = User.find_by(id: params[:user]) @user.roles = params[:roles] end - + private # Use callbacks to share common setup or constraints between actions. @@ -72,12 +73,11 @@ class Management::UsersController < ManagementController # Never trust parameters from the scary internet, only allow the white list through. def user_params - params.require(:user).permit(:name, :email, :password, :password_confirmation, roles: []) + params.require(:user).permit(:name, :email, :password, :password_confirmation, roles_ids: []) end def set_roles @roles = Role.all - end end diff --git a/app/views/management/users/_checkbox.html.erb b/app/views/management/users/_checkbox.html.erb index 8545ada1c4c6f287f2428feee00a5b7b92b4bac2..273dd4c1a1d252df5d988dcab599e8fe5076e535 100644 --- a/app/views/management/users/_checkbox.html.erb +++ b/app/views/management/users/_checkbox.html.erb @@ -1,13 +1,15 @@ +<% @roles = Role.all %> +<%#= debug @roles %> <%= form_for @user do |f| %> <fieldset> <div class="ls-label " > - <%= f.collection_radio_buttons :role, @roles, :role, :role do |r| %> + <%= f.collection_radio_buttons :name, @roles, :name, :name do |r| %> <div class="radio" > - <%= f.radio_button :role, r.text %> - <%= f.label :role, r.text %> + <%= f.radio_button :roles, r.text %> + <%= f.label :roles, r.text %> </div> <% end %> diff --git a/app/views/management/users/admins.html.erb b/app/views/management/users/admins.html.erb index 55a678bcdfbf0429151c3622ff560803df2b2563..2fd58c0a1003189cc0e46b17a48637cf8193fc5d 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> diff --git a/app/views/management/users/curators.html.erb b/app/views/management/users/curators.html.erb index f503d84bc031138d27e7bd2e99c61a8246ce586c..06a52748115997dd3d6ba647de43387db3f54176 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> diff --git a/app/views/management/users/index.html.erb b/app/views/management/users/index.html.erb index 601d75e1b7ce1ff514648ff58db579b6e0b2fdfa..39471d937521285ad6105df6be323bc44a09679e 100644 --- a/app/views/management/users/index.html.erb +++ b/app/views/management/users/index.html.erb @@ -47,7 +47,7 @@ <a href="#"><%= u.name %></a> <% u.roles.each do |r| %> - <span class="ls-tag hidden-xs"><%= r.name %></span> + <span class="ls-tag hidden-xs"><%= u.name %></span> <% end %> </td> <td class="ls-txt-center hidden-xs">Ativo @@ -62,6 +62,7 @@ <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"> + <% @user = u %> <%= render 'checkbox'%> </ul> </div>