Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge

app/controllers/issues_controller.rb

@@ -382,7 +382,7 @@ class IssuesController < ApplicationController
     @export_issues = []
     issues.each do |i|
       issue_array = [i.id, i.tracker.try(:name), i.subject, i.description, i.issue_status.try(:name),i.get_assign_user.try(:show_real_name),
-                     i.priority.try(:name), i.get_issue_tags_name, i.user.try(:show_real_name), format_time(i.created_on), i.version.try(:title),
+                     i.priority.try(:name), i.get_issue_tags_name, i.user.try(:show_real_name), format_time(i.created_on), i.version.try(:name),
                      i.start_date.to_s, i.due_date.to_s, i.done_ratio.to_s + "%", i.issue_type == "2" ? "悬赏" : "普通", i.token.to_s, i.issue_classify]
 
       @export_issues.push(issue_array)

app/models/journal.rb

@@ -36,62 +36,62 @@ class Journal < ApplicationRecord
               value = I18n.t("journal_detail.#{de[3]}")
             when "assigned_to_id"
               u = User.select(:id, :login, :lastname, :firstname)
-              old_value = u.find(de[2]).try(:show_real_name)
+              old_value = de[2].to_i > 0 ? u.find(de[2]).try(:show_real_name) : ""
-              assign_user = de[3].present? ? u.find(de[3]) : ""
+              assign_user = de[3].to_i > 0 ? u.find(de[3]) : ""
               if assign_user.present?
-                value = u.find(de[3]).try(:show_real_name)
+                value = assign_user.try(:show_real_name)
               else
                 value = "取消了指派"
               end
 
             when "tracker_id"
               t = Tracker.select(:id, :name)
-              old_value = t.find(de[2]).try(:name)
+              old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : ""
-              tracker_name = de[3].present? ? t.find(de[3]) : ""
+              tracker_name = de[3].to_i > 0 ? t.find(de[3]) : ""
               if tracker_name
-                value = t.find(de[3]).try(:name)
+                value = tracker_name.try(:name)
               else
                 value = "取消了类型"
               end
 
             when "status_id"
               t = IssueStatus.select(:id, :name)
-              old_value = t.find(de[2]).try(:name)
+              old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : ""
-              type_name = de[3].present? ? t.find(de[3]) : ""
+              type_name = de[3].to_i > 0 ? t.find(de[3]) : ""
               if type_name
-                value = t.find(de[3]).try(:name)
+                value = type_name.try(:name)
               else
                 value = "取消了状态"
               end
             when "priority_id"
               t = IssuePriority.select(:id, :name)
-              old_value = t.find(de[2]).try(:name)
+              old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name): ""
-              type_name = de[3].present? ? t.find(de[3]) : ""
+              type_name = de[3].to_i > 0 ? t.find(de[3]) : ""
               if type_name
-                value = t.find(de[3]).try(:name)
+                value = type_name.try(:name)
               else
                 value = "取消了优先级"
               end
             when "issue_tags_value"
               t = IssueTag.select(:id, :name)
-              old_value = t.where(id: de[2].split(",")).select(:id,:name,:color).as_json
+              old_value = de[2].to_i > 0 ? t.where(id: de[2].split(",")).select(:id,:name,:color).as_json : ""
               if de[3].present?
                 value = t.where(id: de[3].split(",")).select(:id,:name,:color).as_json
               else
                 value = "清空了标签"
               end
             when "fixed_version_id"
-              t = Version.select(:id, :title)
+              t = Version.select(:id, :name)
-              old_value = t.find(de[2]).try(:title)
+              old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : ""
-              type_name = de[3].present? ? t.find(de[3]) : ""
+              type_name = de[3].to_i > 0 ? t.find(de[3]) : ""
               if type_name
-                value = t.find(de[3]).try(:title)
+                value = type_name.try(:name)
               else
                 value = "取消了版本库"
               end
             when "end_time"
               t = IssueTime.select(:id, :start_time, :end_time)
-              type_name = de[2].present? ? t.find(de[2]) : ""
+              type_name = de[2].to_i > 0 ? t.find(de[2]) : ""
               if type_name.present?
                 old_value = "停止工作"
                 d_value = type_name.end_time.to_i - type_name.start_time.to_i

app/views/issues/index.json.jbuilder

@@ -22,7 +22,7 @@ json.issues do
     json.tracker issue.tracker.try(:name)
     json.issue_status issue.issue_status.try(:name)
     json.priority issue.priority.try(:name)
-    json.version issue.version.try(:title)
+    json.version issue.version.try(:name)
     json.done_ratio issue.done_ratio.to_s + "%"
     json.journals_count issue.get_journals_size
     json.issue_tags issue.get_issue_tags

app/views/issues/show.json.jbuilder

@@ -12,7 +12,7 @@ json.author_picture url_to_avatar(@issue_user)
 json.tracker @issue.tracker.try(:name)
 json.issue_status @issue.issue_status.try(:name)
 json.priority @issue.priority.try(:name)
-json.version @issue.version.try(:title)
+json.version @issue.version.try(:name)
 json.issue_tags @issue.get_issue_tags
 json.done_ratio @issue.done_ratio.to_s + "%"
 json.issue_type @issue.issue_type == "1" ? "普通" : "悬赏"

app/views/pull_requests/index.json.jbuilder

@@ -24,7 +24,7 @@ json.issues do
     json.tracker issue.tracker.try(:name)
     json.issue_status issue.issue_status.try(:name)
     json.priority issue.priority.try(:name)
-    json.version issue.version.try(:title)
+    json.version issue.version.try(:name)
     json.done_ratio issue.done_ratio.to_s + "%"
     json.journals_count issue.get_journals_size
     json.issue_tags issue.get_issue_tags

app/views/pull_requests/show.json.jbuilder

@@ -17,7 +17,7 @@ json.issue do
   json.tracker @issue.tracker.try(:name)
   json.issue_status @issue.issue_status.try(:name)
   json.priority @issue.priority.try(:name)
-  json.version @issue.version.try(:title)
+  json.version @issue.version.try(:name)
   json.issue_tags @issue.get_issue_tags
   json.done_ratio @issue.done_ratio.to_s + "%"
   json.issue_type @issue.issue_type == "1" ? "普通" : "悬赏"