Merge pull request '【后台管理】完善用户管理模块-未用到字段移除' (#33) from KingChan/forgeplus:chenjing into feature_gitea_upgrade

app/controllers/admins/users_controller.rb

@@ -64,8 +64,8 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def update_params
-    params.require(:user).permit(%i[lastname nickname gender identity technical_title student_id is_shixun_marker
-                                    mail phone location location_city school_id department_id admin business is_test
-                                    password professional_certification authentication login])
+    params.require(:user).permit(%i[lastname nickname gender technical_title is_shixun_marker
+                                    mail phone location location_city school_id department_id admin
+                                    password  login])
   end
 end

app/views/admins/users/edit.html.erb

@@ -63,19 +63,6 @@
         <%= f.input :gender, as: :radio_buttons, label: '性别', collection: [%w(男 0), %w(女 1)], wrapper_html: { class: 'col-md-3' } %>
       </div>
 
-      <div class="form-row user-identity-select">
-        <div class="form-group select optional col-md-1">
-          <%= f.label :identity, label: '职业' %>
-          <%= select_tag('user[identity]', [], class: 'form-control identity-select optional', 'data-value': @user.user_extension&.identity, 'data-first-title': '请选择') %>
-        </div>
-        <div class="form-group technical-title-select-wrapper optional col-md-1" style="<%= @user&.user_extension&.student? ? 'display:none;' : '' %>">
-          <%= f.label :technical_title, label: '职称' %>
-          <%= select_tag('user[technical_title]', [], class: 'form-control technical-title-select optional', 'data-value': @user.technical_title) %>
-        </div>
-
-        <%= f.input :student_id, as: :tel, label: '学号', wrapper_html: { class: 'col-md-2', style: @user&.user_extension&.student? ? '' : 'display:none;' }, input_html: { class: 'student-id-input' } %>
-      </div>
-
       <div class="form-row">
         <%= f.input :mail, as: :email, label: '邮箱地址', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
         <%= f.input :phone, as: :tel, label: '手机号', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'off' } %>
@@ -102,19 +89,10 @@
           <%= f.label :role, label: '角色' %>
           <div class="d-flex">
             <%= f.input :admin, as: :boolean, label: '管理员', checked_value: 1, unchecked_value: 0 %>
-            <%= f.input :business, as: :boolean, label: '运营人员', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
-            <%= f.input :is_test, as: :boolean, label: '测试账号', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
           </div>
         </div>
       <% end %>
 
-      <div class="form-group check_boxes optional">
-        <%= f.label :role, label: '认证信息' %>
-        <div class="d-flex">
-          <%= f.input :professional_certification, as: :boolean, label: '职业认证', checked_value: 1, unchecked_value: 0 %>
-          <%= f.input :authentication, as: :boolean, label: '实名认证', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
-        </div>
-      </div>
 
       <div class="form-row">
         <%= f.input :password, as: :password, label: '修改密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'new-password' } %>

app/views/admins/users/index.html.erb

@@ -10,11 +10,7 @@
       <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
     </div>
 
-    <div class="form-group mr-2">
-      <label for="identity">职业：</label>
-      <% identity_options = [['全部', ''], ['教师', 0], ['学生', 1], ['专业人士', 2]] %>
-      <%= select_tag(:identity, options_for_select(identity_options), class: 'form-control') %>
-    </div>
+   
     <div class="form-group mr-2">
       <label for="identity">类型：</label>
       <% open_user_type_options = [['所有用户', ''], ['头歌同步', "OpenUsers::Educoder"], ['平台注册', "Forge"],] %>

app/views/admins/users/shared/_user_list.html.erb

@@ -24,7 +24,6 @@
           </td>
           <td><%= overflow_hidden_span display_text(user.mail), width: 150 %></td>
           <td><%= overflow_hidden_span display_text(user.phone), width: 100 %></td>
-          <td><%= user.identity %></td>
           <td><%= display_text(user.created_on&.strftime('%Y-%m-%d %H:%M')) %></td>
           <td><%= display_text(user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
           <td><%= link_to user.projects_count, "/#{user.login}/projects", target: "_blank" %></td>