Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop

app/controllers/api/pm/pipelines_controller.rb

@@ -23,7 +23,6 @@ class Api::Pm::PipelinesController < Api::Pm::BaseController
         pipeline = Action::Pipeline.find_or_initialize_by(pipeline_name: file.to_s.gsub(".yml", "").gsub(".yaml", ""),
                                         file_name: ".gitea/workflows/#{file}",
                                         branch: project.default_branch,
-                                        is_graphic_design: false,
                                         disable: false,
                                         project_id: project.id)
         interactor = Repositories::EntriesInteractor.call(@owner, project.identifier, ".gitea/workflows/#{file}", ref: project.default_branch)

app/models/issue.rb

@@ -141,6 +141,20 @@ class Issue < ApplicationRecord
     end
   end
 
+  def pm_issue_type_chinese_string
+    case pm_issue_type
+    when 1
+      "需求"
+    when 2
+      "任务"
+    when 3
+      "缺陷"
+    else
+      "疑修"
+    end
+  end
+
+
   def destroy_be_pm_links
     PmLink.where(be_linkable_type:"Issue",be_linkable_id:self.id).map(&:destroy)
   end

app/models/journal.rb

@@ -483,36 +483,30 @@ class Journal < ApplicationRecord
       end
       return content
     when 'link_issue'
-      old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
-      new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
+      old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type_chinese_string}]-<#{i.subject}></b>"}.join("、")
+      new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i|  i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type_chinese_string}]-<#{i.subject}></b>"}.join("、")
       if detail.old_value.nil? || detail.old_value.blank? 
-        content += "新建了关联的工作项#{new_value}"
+        content += "新建了关联的#{new_value}"
       else 
         if detail.value.nil? || detail.value.blank? 
-          content += "删除了关联的工作项#{old_value}"
+          content += "删除了关联的#{old_value}"
         else 
-          content += "新建了关联的工作项#{new_value}"
+          content += "新建了关联的#{new_value}"
         end
       end
-      content.gsub!('1', "需求")
-      content.gsub!('2', "任务")
-      content.gsub!('3', "缺陷")
       return content
     when 'tag_link_issue'
-      old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
-      new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
+      old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type_chinese_string}]-<#{i.subject}></b>"}.join("、")
+      new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i|  i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type_chinese_string}]-<#{i.subject}></b>"}.join("、")
       if detail.old_value.nil? || detail.old_value.blank? 
-        content += "关联了工作项#{new_value}"
+        content += "关联了#{new_value}"
       else 
         if detail.value.nil? || detail.value.blank? 
-          content += "取消了关联的工作项#{old_value}"
+          content += "取消了关联的#{old_value}"
         else 
-          content += "关联了工作项#{new_value}"
+          content += "关联了#{new_value}"
         end
       end
-      content.gsub!('1', "需求")
-      content.gsub!('2', "任务")
-      content.gsub!('3', "缺陷")
       return content
     when 'issue'
       issue = self.issue
@@ -535,6 +529,7 @@ class Journal < ApplicationRecord
     case detail.property
     when 'issue'
       content += "创建了<b>疑修</b>"
+      return content
     when 'attachment'
       old_value = Attachment.where("BINARY id in (?) or uuid in (?)", detail.old_value.to_s.split(","), detail.old_value.to_s.split(",")).pluck(:filename).join("、")
       new_value = Attachment.where("BINARY id in (?) or uuid in (?)", detail.value.to_s.split(","), detail.value.to_s.split(",")).pluck(:filename).join("、")
@@ -544,6 +539,7 @@ class Journal < ApplicationRecord
         new_value = "无" if new_value.blank?
         content += "将附件由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
       end
+      return content
     when 'issue_tag'
       old_value = IssueTag.where(id: detail.old_value.split(",")).pluck(:name).join("、")
       new_value = IssueTag.where(id: detail.value.split(",")).pluck(:name).join("、")
@@ -553,6 +549,7 @@ class Journal < ApplicationRecord
         new_value = "无" if new_value.blank?
         content += "将标记由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
       end
+      return content
     when 'assigner'
       old_value = User.where(id: detail.old_value.split(",")).map{|u| u.real_name}.join("、")
       new_value = User.where(id: detail.value.split(",")).map{|u| u.real_name}.join("、")
@@ -562,6 +559,7 @@ class Journal < ApplicationRecord
         new_value = "无" if new_value.blank?
         content += "将负责人由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
       end
+      return content
     when 'attr'
       content += "将"
       case detail.prop_key
@@ -604,8 +602,9 @@ class Journal < ApplicationRecord
         new_value = "无" if new_value.blank?
         content += "由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
       end
+      return content
     end
-    
+    content = self.pm_operate_content if content == ""
   end
 
   def journal_content

app/views/api/v1/issues/_simple_detail.json.jbuilder

@@ -1,4 +1,11 @@
-json.(issue, :id, :subject, :project_issues_index)
+json.(issue, :id, :subject, :project_issues_index, :project_id)
+json.project do 
+  if issue.project.present?
+    json.partial! "api/v1/projects/simple_detail", locals: {project: issue.project}
+  else
+    json.nil! 
+  end
+end
 json.blockchain_token_num (Site.has_blockchain? && issue.project&.use_blockchain) ? issue.blockchain_token_num : nil
 json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M")
 json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M")

app/views/api/v1/issues/journals/_detail.json.jbuilder

@@ -8,7 +8,7 @@ end
 if journal.is_journal_detail? 
   detail = journal.journal_details.take
   json.operate_category @issue.pm_issue_type.nil? ? detail.property == "attr" ? detail.prop_key : detail.property : journal.pm_operate_category
-  json.operate_content journal.is_journal_detail? ? @issue.pm_issue_type.nil? ? journal.operate_content : journal.pm_operate_content : nil
+  json.operate_content journal.is_journal_detail? ? @issue.pm_project_id.nil? && @issue.pm_issue_type.nil? ? journal.operate_content : journal.pm_operate_content : nil
 else
   json.notes journal.notes 
   json.comments_count journal.comments_count