Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

app/models/project_actions/fork_event.rb

@@ -24,7 +24,7 @@ class ProjectActions::ForkEvent < ProjectAction
       forkee_name: fork_project.identifier,
       forkee_owner_id: fork_project.owner.id,
       forkee_owner_login: fork_project.owner.login 
-    }
+    }.as_json
     project_action.save!
   end
 end

app/models/project_actions/issue_comment_event.rb

@@ -23,7 +23,7 @@ class ProjectActions::IssueCommentEvent < ProjectAction
       issue_id: issue.id,
       issue_number: issue.project_issues_index,
       body: journal.notes
-    }
+    }.as_json
     project_action.save!
   end
 end

app/models/project_actions/issues_event.rb

@@ -27,7 +27,7 @@ class ProjectActions::IssuesEvent < ProjectAction
       title: issue.subject,
       body: issue.description,
       action: action
-    }
+    }.as_json
     project_action.save!
   end
 end

app/models/project_actions/pull_request_event.rb

@@ -25,8 +25,8 @@ class ProjectActions::PullRequestEvent < ProjectAction
       pull_id: pull_request.id,
       pull_number: pull_request.gitea_number,
       title: pull_request.title,
-      body: pull_request.body,
-      git_diff: gitea_pull_request,
+      # body: pull_request.body,
+      # git_diff: gitea_pull_request,
       additions: gitea_pull_request['TotalAddition'],
       deletions: gitea_pull_request['TotalDeletion'],
       changed_files: gitea_pull_request['NumFiles'],
@@ -35,7 +35,7 @@ class ProjectActions::PullRequestEvent < ProjectAction
       head_repo_id: pull_request.is_original ? pull_request.fork_project_id : pull_request.project_id,
       head_repo_name: pull_request.project&.identifier,
       head_ref: pull_request.head
-    }
+    }.as_json
     project_action.save!
   end
 end

app/models/project_actions/pull_request_review_comment_event.rb

@@ -23,7 +23,7 @@ class ProjectActions::PullRequestReviewCommentEvent < ProjectAction
       pull_id: pull_request.id,
       pull_number: pull_request.gitea_number,
       body: journal.notes
-    }
+    }.as_json
     project_action.save!
   end
 end

app/models/project_actions/release_event.rb

@@ -23,7 +23,7 @@ class ProjectActions::ReleaseEvent < ProjectAction
       tag_name: version_release.tag_name,
       name: version_release.name,
       body: version_release.body
-    }
+    }.as_json
     project_action.save!
   end
 end

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}<br/>邮箱：#{user&.mail}<br/>手机号：#{user&.phone}<br/>昵称：#{user&.nickname}<br/>"
     when "DestroyProject" then "项目名称：#{project&.name}<br/>项目标识：#{project&.identifier}<br/>"
     when "DestroyOrganization" then "组织名称：#{organization&.nickname}<br/>组织标识：#{organization&.login}<br/>"
+    when 'Attachment'
+      issue = Issue.find_by_id(attachment.container_id)
+      if attachment.container_type == "Issue" && issue&.issue_classify == "issue"
+        return "上传附件issue地址：<a href=\"#{Rails.application.config_for(:configuration)['platform_url']}/#{issue&.project&.owner&.login}/#{issue&.project&.identifier}/issues/#{issue&.project_issues_index}\">#{issue&.subject}</a>"
+      else
+        return "上传附件地址：<a href=\"#{Rails.application.config_for(:configuration)['platform_url']}/attachments/#{attachment.uuid}\">#{attachment.title}</a>"
+      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

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

@@ -5,9 +5,9 @@
 <div class="box search-form-container user-list-form">
   <%= 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(: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 %>

app/views/api/v1/projects/pipelines/build_pipeline.yaml.erb

@@ -19,6 +19,7 @@ on:
   <% end %>
   <%if node.name.to_s.include?("on-pull_request") %>
   pull_request:
+    types: [opened, reopened]
   <% end %>
   <%if node.name.to_s.include?("on-fork") %>
   fork:

config/harmonious_dictionary/chinese_dictionary.txt

@@ -497,8 +497,6 @@ a级情片
 迷药
 强迫
 色情
-三級
-三级
 A片
 喷精
 偷窥