From 3a38cb675c47f2784421be3a86ea94fa23cc7561 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 15 Oct 2025 15:04:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user_action.rb | 21 +++++++++++++++++++- app/views/admins/user_actions/index.html.erb | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/models/user_action.rb b/app/models/user_action.rb index 0dba93da4..d0a5a6605 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -25,6 +25,8 @@ class UserAction < ApplicationRecord + belongs_to :user, optional: true + after_save :add_user_info serialize :data_bank, JSON @@ -36,6 +38,7 @@ class UserAction < ApplicationRecord when "Login" then "登录" when "Logout" then "退出登录" when "DestroyOrganization" then "删除组织" + when "Attachment" then "上传附件" else self.action_type end end @@ -43,7 +46,7 @@ class UserAction < ApplicationRecord def opt_user_name user = User.find_by(id: self.user_id) if user.present? - user&.login + user&.real_name else del_user = UserAction.find_by(action_type: "DestroyUser", action_id: self.user_id) del_user.present? ? del_user.user.login : "不存在用户：#{user_id}" @@ -55,6 +58,13 @@ class UserAction < ApplicationRecord when "DestroyUser" then "账号：#{user&.login}
邮箱：#{user&.mail}
手机号：#{user&.phone}
昵称：#{user&.nickname}
" when "DestroyProject" then "项目名称：#{project&.name}
项目标识：#{project&.identifier}
" when "DestroyOrganization" then "组织名称：#{organization&.nickname}
组织标识：#{organization&.login}
" + when 'Attachment' + issue = Issue.find_by_id(attachment.container_id) + if attachment.container_type == "Issue" && issue&.issue_classify == "issue" + return "上传附件issue地址：#{issue&.subject}" + else + return "上传附件地址：#{attachment.title}" + end else "--" end end @@ -86,6 +96,15 @@ class UserAction < ApplicationRecord action_organization end + def attachment + action_attachment = if action_type == "Attachment" && data_bank.present? + build_mode("Attachment") + else + Attachment.find_by(id: self.action_id) + end + action_attachment + end + def build_mode(model_name) model = model_name.constantize.new diff --git a/app/views/admins/user_actions/index.html.erb b/app/views/admins/user_actions/index.html.erb index 3be99282a..3d4c4034b 100644 --- a/app/views/admins/user_actions/index.html.erb +++ b/app/views/admins/user_actions/index.html.erb @@ -5,7 +5,7 @@
<%= form_tag(admins_user_actions_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> 操作类型： - <% action_type_options = [['自定义',''],['删除用户','DestroyUser'], ['删除项目', 'DestroyProject'], ['删除组织', 'DestroyOrganization']] %> + <% action_type_options = [['Attachment', '上传附件'], ['Login','登录'], ['Logout', '退出登录'],['删除用户','DestroyUser'], ['删除项目', 'DestroyProject'], ['删除组织', 'DestroyOrganization']] %> <%= select_tag(:action_type_select, options_for_select(action_type_options), class: 'form-control') %> <%= text_field_tag(:action_type, params[:action_type], class: 'form-control col-sm-2 ml-3',style: 'display:;', placeholder: '自定义操作类型检索') %> <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '操作人用户名/邮箱/手机号检索') %> From 8111c13417357d218b2e60c96c55469c4c830650 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 15 Oct 2025 15:08:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fixed:=20=E4=BC=A0=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/user_actions/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admins/user_actions/index.html.erb b/app/views/admins/user_actions/index.html.erb index 3d4c4034b..39a54569a 100644 --- a/app/views/admins/user_actions/index.html.erb +++ b/app/views/admins/user_actions/index.html.erb @@ -5,9 +5,9 @@
<%= form_tag(admins_user_actions_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> 操作类型： - <% action_type_options = [['Attachment', '上传附件'], ['Login','登录'], ['Logout', '退出登录'],['删除用户','DestroyUser'], ['删除项目', 'DestroyProject'], ['删除组织', 'DestroyOrganization']] %> + <% action_type_options = [['上传附件', 'Attachment'], ['登录', 'Login'], ['退出登录', 'Logout'],['删除用户','DestroyUser'], ['删除项目', 'DestroyProject'], ['删除组织', 'DestroyOrganization']] %> <%= select_tag(:action_type_select, options_for_select(action_type_options), class: 'form-control') %> - <%= text_field_tag(:action_type, params[:action_type], class: 'form-control col-sm-2 ml-3',style: 'display:;', placeholder: '自定义操作类型检索') %> + <%#= text_field_tag(:action_type, params[:action_type], class: 'form-control col-sm-2 ml-3',style: 'display:;', placeholder: '自定义操作类型检索') %> <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '操作人用户名/邮箱/手机号检索') %> <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> <% end %> From 2905da7b14de30ed6fa67b775dd94a8dfb54364d Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 15 Oct 2025 15:11:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fixed:=20=E4=BC=A0=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/user_actions/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/user_actions/index.html.erb b/app/views/admins/user_actions/index.html.erb index 39a54569a..7cc0a3346 100644 --- a/app/views/admins/user_actions/index.html.erb +++ b/app/views/admins/user_actions/index.html.erb @@ -7,7 +7,7 @@ 操作类型： <% action_type_options = [['上传附件', 'Attachment'], ['登录', 'Login'], ['退出登录', 'Logout'],['删除用户','DestroyUser'], ['删除项目', 'DestroyProject'], ['删除组织', 'DestroyOrganization']] %> <%= select_tag(:action_type_select, options_for_select(action_type_options), class: 'form-control') %> - <%#= text_field_tag(:action_type, params[:action_type], class: 'form-control col-sm-2 ml-3',style: 'display:;', placeholder: '自定义操作类型检索') %> + <%= text_field_tag(:action_type, params[:action_type], class: 'form-control col-sm-2 ml-3',style: 'display:;', placeholder: '自定义操作类型检索') %> <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '操作人用户名/邮箱/手机号检索') %> <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> <% end %> From 4e48bdb34f20f66b710e5f007be23f30f0cce429 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 15 Oct 2025 15:18:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fixed:=20=E9=BB=98=E8=AE=A4=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/user_actions/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/user_actions/index.html.erb b/app/views/admins/user_actions/index.html.erb index 7cc0a3346..371633b58 100644 --- a/app/views/admins/user_actions/index.html.erb +++ b/app/views/admins/user_actions/index.html.erb @@ -7,7 +7,7 @@ 操作类型： <% action_type_options = [['上传附件', 'Attachment'], ['登录', 'Login'], ['退出登录', 'Logout'],['删除用户','DestroyUser'], ['删除项目', 'DestroyProject'], ['删除组织', 'DestroyOrganization']] %> <%= select_tag(:action_type_select, options_for_select(action_type_options), class: 'form-control') %> - <%= text_field_tag(:action_type, params[:action_type], class: 'form-control col-sm-2 ml-3',style: 'display:;', placeholder: '自定义操作类型检索') %> + <%= text_field_tag(:action_type, params[:action_type], class: 'form-control col-sm-2 ml-3',style: 'display: none;', placeholder: '自定义操作类型检索') %> <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '操作人用户名/邮箱/手机号检索') %> <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> <% end %>