edit with role

Author: qinmingyuan

app/controllers/auth/panel/users_controller.rb

@@ -1,14 +1,18 @@
 module Auth
   class Panel::UsersController < Panel::BaseController
-    before_action :set_user, only: [:show, :edit, :update, :edit_user_tags, :destroy]
+    before_action :set_user, only: [:show, :edit, :update, :edit_user_tags, :edit_role, :destroy]
 
     def index
       q_params = {
         'created_at-desc': 2
       }
       q_params.merge! user_filter_params
 
-      @users = User.with_attached_avatar.includes(:accounts, :roles, oauth_users: :app).default_where(q_params).page(params[:page])
+      @users = User.with_attached_avatar.includes(
+        :accounts,
+        :role,
+        oauth_users: :app
+      ).default_where(q_params).page(params[:page])
     end
 
     def month
@@ -28,6 +32,10 @@ def edit_user_tags
       @user_tags = UserTag.default_where(default_params).page(params[:page])
     end
 
+    def edit_role
+      @roles = Roled::UserRole.all
+    end
+
     def mock
       @user = User.find_or_initialize_by(user_uuid: params[:account])
 
@@ -68,6 +76,7 @@ def user_permit_params
         :avatar,
         :password,
         :disabled,
+        :role_id,
         user_tag_ids: [],
         accounts_attributes: {}
       ]

app/views/auth/panel/users/_base/_index_tbody.html.erb

@@ -41,14 +41,7 @@
   <% end %>
 </td>
 <td>
-  <div class="tags">
-    <% model.roles.pluck(:name).each do |role| %>
-      <span class="tag"><%= role %></span>
-    <% end %>
-  </div>
-  <div>
-    <%= link_to({ controller: 'roled/panel/whos', action: 'edit', who_type: model.base_class_name, who_id: model.id }, aria: { label: t('roled.panel.whos.edit.title') }, data: { turbo_frame: 'modal' }, class: 'button is-small is-rounded is-light') do %>
-      <i class="fa-solid fa-user-lock"></i>
-    <% end %>
-  </div>
+<% if model.role %>
+  <span class="tag"><%= model.role.name %></span>
+<% end %>
 </td>

app/views/auth/panel/users/_base/_index_tr.html.erb

@@ -17,6 +17,10 @@
         <i class="fa-solid fa-user-tag text-success"></i>
         <span class="ml-1"><%= t('.edit_user_tags.title') %></span>
       <% end %>
+      <%= button_to({ action: 'edit_role', id: model.id }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-solid fa-user-lock"></i>
+        <span class="ml-1"><%= t('.edit_role.title') %></span>
+      <% end %>
     </div>
   </td>
 </tr>

app/views/auth/panel/users/_edit_modal_form.html.erb app/views/auth/panel/users/_role_form.html.erb

@@ -2,7 +2,7 @@
   <%= render 'modal_header' %>
   <div class="modal-card-body">
     <%= render 'error_messages', target: @user %>
-    <%= f.collection_check_boxes :role_ids, @roles, :id, :name %>
+    <%= f.collection_radio_buttons :role_id, @roles, :id, :name %>
   </div>
   <%= f.submit %>
 <% end %>

app/views/auth/panel/users/edit_role.turbo_stream.erb

@@ -1 +1 @@
-<%= turbo_stream.append 'body', partial: 'user_tags_form', layout: 'modal_form' %>
+<%= turbo_stream.append 'body', partial: 'role_form', layout: 'modal_form' %>

config/locales/zh.controller.yml

@@ -78,9 +78,10 @@ zh:
       users:
         index:
           title: 用户列表
-          role: 角色设置
         edit_user_tags:
           title: 用户标签
+        edit_role:
+          title: 权限管理
       accounts:
         index:
           title: 账号