diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3efcd19a9..290bb819a 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -324,17 +324,11 @@ class IssuesController < ApplicationController
end
if @issue.update_attribute(:status_id, type)
if type == 5
- # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "close")
@issue&.project_trends&.update_all(action_type: "close")
@issue.issue_times.update_all(end_time: Time.now)
else
@issue&.project_trends&.update_all(action_type: "create")
- # version = @issue&.version
- # if version.present?
- # percent = version.issues_count == 0 ? 0.0 : ((version.closed_issues_count - 1) / version.issues_count)
- # version.update_attributes(closed_issues_count: (version.closed_issues_count - 1), percent: percent)
- # end
end
@issue.custom_journal_detail("close_issue",old_message, "#{message}")
diff --git a/app/models/issue.rb b/app/models/issue.rb
index a8a687d78..17451e021 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -6,7 +6,7 @@ class Issue < ApplicationRecord
has_one :pull_request
# belongs_to :issue_tag,optional: true
belongs_to :priority, :class_name => 'IssuePriority', foreign_key: :priority_id,optional: true
- belongs_to :version, foreign_key: :fixed_version_id,optional: true, counter_cache: :issues_count
+ belongs_to :version, foreign_key: :fixed_version_id,optional: true, counter_cache: true
belongs_to :user,optional: true, foreign_key: :author_id
belongs_to :issue_status, foreign_key: :status_id,optional: true
has_many :commit_issues
@@ -23,7 +23,7 @@ class Issue < ApplicationRecord
scope :issue_issue, ->{where(issue_classify: [nil,"issue"])}
scope :issue_pull_request, ->{where(issue_classify: "pull_request")}
- after_save :change_versions_count
+ after_update :change_versions_count
def get_assign_user
diff --git a/app/views/versions/show.json.jbuilder b/app/views/versions/show.json.jbuilder
index 8cbf6445e..c330d5602 100644
--- a/app/views/versions/show.json.jbuilder
+++ b/app/views/versions/show.json.jbuilder
@@ -8,7 +8,8 @@ json.user_login @version.version_user.try(:login)
json.created_at format_time(@version.created_on)
json.updated_at format_time(@version.updated_on)
json.search_count @version_issues_size
-json.extract! @version, :id,:name,:project_id,:description, :effective_date, :status, :sharing,:wiki_page_title,:percent
+json.percent @version.percent*100
+json.extract! @version, :id,:name,:project_id,:description, :effective_date, :status, :sharing,:wiki_page_title
json.issues do
json.array! @version_issues.each.to_a do |issue|
diff --git a/public/react/build/asset-manifest.json b/public/react/build/asset-manifest.json
index 774b3c10f..4ac63a7fe 100644
--- a/public/react/build/asset-manifest.json
+++ b/public/react/build/asset-manifest.json
@@ -29,7 +29,7 @@
"./static/js/122.186f854f.chunk.js": "./static/js/122.186f854f.chunk.js",
"./static/js/123.8c68d28a.chunk.js": "./static/js/123.8c68d28a.chunk.js",
"./static/js/124.408ebb33.chunk.js": "./static/js/124.408ebb33.chunk.js",
- "./static/js/125.12bc75c5.chunk.js": "./static/js/125.12bc75c5.chunk.js",
+ "./static/js/125.2e783f68.chunk.js": "./static/js/125.2e783f68.chunk.js",
"./static/js/126.7167d483.chunk.js": "./static/js/126.7167d483.chunk.js",
"./static/js/127.cd709423.chunk.js": "./static/js/127.cd709423.chunk.js",
"./static/js/128.0f3f6907.chunk.js": "./static/js/128.0f3f6907.chunk.js",
@@ -60,21 +60,21 @@
"./static/js/150.2d8568a9.chunk.js": "./static/js/150.2d8568a9.chunk.js",
"./static/js/151.9b55bafe.chunk.js": "./static/js/151.9b55bafe.chunk.js",
"./static/js/152.235dc8d0.chunk.js": "./static/js/152.235dc8d0.chunk.js",
- "./static/js/153.c66c3a72.chunk.js": "./static/js/153.c66c3a72.chunk.js",
+ "./static/js/153.29c7fa4c.chunk.js": "./static/js/153.29c7fa4c.chunk.js",
"./static/js/154.6661c864.chunk.js": "./static/js/154.6661c864.chunk.js",
"./static/js/155.ed22d6b2.chunk.js": "./static/js/155.ed22d6b2.chunk.js",
"./static/js/156.a71c0de3.chunk.js": "./static/js/156.a71c0de3.chunk.js",
"./static/js/157.01fef202.chunk.js": "./static/js/157.01fef202.chunk.js",
"./static/js/158.b8182b3b.chunk.js": "./static/js/158.b8182b3b.chunk.js",
- "./static/js/159.eb18a707.chunk.js": "./static/js/159.eb18a707.chunk.js",
+ "./static/js/159.b2ac2c9d.chunk.js": "./static/js/159.b2ac2c9d.chunk.js",
"./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js",
- "./static/js/160.f28de0eb.chunk.js": "./static/js/160.f28de0eb.chunk.js",
+ "./static/js/160.2ce62b5e.chunk.js": "./static/js/160.2ce62b5e.chunk.js",
"./static/js/161.1289bb4c.chunk.js": "./static/js/161.1289bb4c.chunk.js",
"./static/js/162.15c1b2d7.chunk.js": "./static/js/162.15c1b2d7.chunk.js",
"./static/js/163.c711c38f.chunk.js": "./static/js/163.c711c38f.chunk.js",
- "./static/js/164.4b22c987.chunk.js": "./static/js/164.4b22c987.chunk.js",
+ "./static/js/164.a2076de0.chunk.js": "./static/js/164.a2076de0.chunk.js",
"./static/js/165.dec54504.chunk.js": "./static/js/165.dec54504.chunk.js",
- "./static/js/166.686b2b4d.chunk.js": "./static/js/166.686b2b4d.chunk.js",
+ "./static/js/166.251b058d.chunk.js": "./static/js/166.251b058d.chunk.js",
"./static/js/167.7a30e1c2.chunk.js": "./static/js/167.7a30e1c2.chunk.js",
"./static/js/168.471f4346.chunk.js": "./static/js/168.471f4346.chunk.js",
"./static/js/169.2649e466.chunk.js": "./static/js/169.2649e466.chunk.js",
@@ -92,7 +92,7 @@
"./static/js/18.105e1eb7.chunk.js": "./static/js/18.105e1eb7.chunk.js",
"./static/js/180.abba8537.chunk.js": "./static/js/180.abba8537.chunk.js",
"./static/js/181.b42edfcd.chunk.js": "./static/js/181.b42edfcd.chunk.js",
- "./static/js/182.80f583b4.chunk.js": "./static/js/182.80f583b4.chunk.js",
+ "./static/js/182.52e50bd4.chunk.js": "./static/js/182.52e50bd4.chunk.js",
"./static/js/183.b34ed057.chunk.js": "./static/js/183.b34ed057.chunk.js",
"./static/js/184.c7d63100.chunk.js": "./static/js/184.c7d63100.chunk.js",
"./static/js/185.9c6c47a4.chunk.js": "./static/js/185.9c6c47a4.chunk.js",
@@ -110,7 +110,7 @@
"./static/js/196.c1938f28.chunk.js": "./static/js/196.c1938f28.chunk.js",
"./static/js/197.f187b9d8.chunk.js": "./static/js/197.f187b9d8.chunk.js",
"./static/js/198.3f1fe6b4.chunk.js": "./static/js/198.3f1fe6b4.chunk.js",
- "./static/js/199.45694800.chunk.js": "./static/js/199.45694800.chunk.js",
+ "./static/js/199.ed77f6d9.chunk.js": "./static/js/199.ed77f6d9.chunk.js",
"./static/js/2.bc3d8cf1.chunk.js": "./static/js/2.bc3d8cf1.chunk.js",
"./static/js/20.f22140b1.chunk.js": "./static/js/20.f22140b1.chunk.js",
"./static/js/200.263ef8f9.chunk.js": "./static/js/200.263ef8f9.chunk.js",
@@ -221,7 +221,7 @@
"./static/js/50.49a23628.chunk.js": "./static/js/50.49a23628.chunk.js",
"./static/js/51.4eb1ce58.chunk.js": "./static/js/51.4eb1ce58.chunk.js",
"./static/js/52.f17e0e11.chunk.js": "./static/js/52.f17e0e11.chunk.js",
- "./static/js/53.abef9d53.chunk.js": "./static/js/53.abef9d53.chunk.js",
+ "./static/js/53.e60d46bb.chunk.js": "./static/js/53.e60d46bb.chunk.js",
"./static/js/54.74e62ba5.chunk.js": "./static/js/54.74e62ba5.chunk.js",
"./static/js/55.abe23415.chunk.js": "./static/js/55.abe23415.chunk.js",
"./static/js/56.31429d59.chunk.js": "./static/js/56.31429d59.chunk.js",
@@ -233,21 +233,21 @@
"./static/js/61.42df9549.chunk.js": "./static/js/61.42df9549.chunk.js",
"./static/js/62.88296aa0.chunk.js": "./static/js/62.88296aa0.chunk.js",
"./static/js/63.3bac03de.chunk.js": "./static/js/63.3bac03de.chunk.js",
- "./static/js/64.dfd848c1.chunk.js": "./static/js/64.dfd848c1.chunk.js",
+ "./static/js/64.48e9b5d8.chunk.js": "./static/js/64.48e9b5d8.chunk.js",
"./static/js/65.88707d5e.chunk.js": "./static/js/65.88707d5e.chunk.js",
- "./static/js/66.7a7f45dc.chunk.js": "./static/js/66.7a7f45dc.chunk.js",
+ "./static/js/66.dc4e725c.chunk.js": "./static/js/66.dc4e725c.chunk.js",
"./static/js/67.0f65cd89.chunk.js": "./static/js/67.0f65cd89.chunk.js",
"./static/js/68.792bbdc2.chunk.js": "./static/js/68.792bbdc2.chunk.js",
"./static/js/69.ad66f4c7.chunk.js": "./static/js/69.ad66f4c7.chunk.js",
"./static/js/7.231bff40.chunk.js": "./static/js/7.231bff40.chunk.js",
"./static/js/70.adb8d0da.chunk.js": "./static/js/70.adb8d0da.chunk.js",
"./static/js/71.7a76b045.chunk.js": "./static/js/71.7a76b045.chunk.js",
- "./static/js/72.89e36d50.chunk.js": "./static/js/72.89e36d50.chunk.js",
- "./static/js/73.6f7ce494.chunk.js": "./static/js/73.6f7ce494.chunk.js",
+ "./static/js/72.fa0e7247.chunk.js": "./static/js/72.fa0e7247.chunk.js",
+ "./static/js/73.3b15d4d7.chunk.js": "./static/js/73.3b15d4d7.chunk.js",
"./static/js/74.cfa0f703.chunk.js": "./static/js/74.cfa0f703.chunk.js",
"./static/js/75.385cc133.chunk.js": "./static/js/75.385cc133.chunk.js",
"./static/js/76.5a64bd52.chunk.js": "./static/js/76.5a64bd52.chunk.js",
- "./static/js/77.12cf88d2.chunk.js": "./static/js/77.12cf88d2.chunk.js",
+ "./static/js/77.6e6cf319.chunk.js": "./static/js/77.6e6cf319.chunk.js",
"./static/js/78.2a0a496c.chunk.js": "./static/js/78.2a0a496c.chunk.js",
"./static/js/79.de080f3a.chunk.js": "./static/js/79.de080f3a.chunk.js",
"./static/js/8.e2184916.chunk.js": "./static/js/8.e2184916.chunk.js",
@@ -255,25 +255,25 @@
"./static/js/81.c2fc7f34.chunk.js": "./static/js/81.c2fc7f34.chunk.js",
"./static/js/82.3f3fb911.chunk.js": "./static/js/82.3f3fb911.chunk.js",
"./static/js/83.b75fac03.chunk.js": "./static/js/83.b75fac03.chunk.js",
- "./static/js/84.d8ec6b74.chunk.js": "./static/js/84.d8ec6b74.chunk.js",
- "./static/js/85.9202ffba.chunk.js": "./static/js/85.9202ffba.chunk.js",
+ "./static/js/84.8fbe53ba.chunk.js": "./static/js/84.8fbe53ba.chunk.js",
+ "./static/js/85.c3e5f813.chunk.js": "./static/js/85.c3e5f813.chunk.js",
"./static/js/86.c4fa328e.chunk.js": "./static/js/86.c4fa328e.chunk.js",
"./static/js/87.3c551684.chunk.js": "./static/js/87.3c551684.chunk.js",
"./static/js/88.4e63f179.chunk.js": "./static/js/88.4e63f179.chunk.js",
- "./static/js/89.5520ee99.chunk.js": "./static/js/89.5520ee99.chunk.js",
+ "./static/js/89.693c6b3e.chunk.js": "./static/js/89.693c6b3e.chunk.js",
"./static/js/9.6f9ef4ac.chunk.js": "./static/js/9.6f9ef4ac.chunk.js",
- "./static/js/90.c9591325.chunk.js": "./static/js/90.c9591325.chunk.js",
- "./static/js/91.920ffa5a.chunk.js": "./static/js/91.920ffa5a.chunk.js",
+ "./static/js/90.88cf203c.chunk.js": "./static/js/90.88cf203c.chunk.js",
+ "./static/js/91.a6f23b34.chunk.js": "./static/js/91.a6f23b34.chunk.js",
"./static/js/92.9e9e70b1.chunk.js": "./static/js/92.9e9e70b1.chunk.js",
"./static/js/93.8a6c50b0.chunk.js": "./static/js/93.8a6c50b0.chunk.js",
- "./static/js/94.8e4cf365.chunk.js": "./static/js/94.8e4cf365.chunk.js",
+ "./static/js/94.e00976e5.chunk.js": "./static/js/94.e00976e5.chunk.js",
"./static/js/95.f1ba604f.chunk.js": "./static/js/95.f1ba604f.chunk.js",
"./static/js/96.46e744a4.chunk.js": "./static/js/96.46e744a4.chunk.js",
"./static/js/97.eb363f34.chunk.js": "./static/js/97.eb363f34.chunk.js",
"./static/js/98.88d3b919.chunk.js": "./static/js/98.88d3b919.chunk.js",
"./static/js/99.bb3d2c54.chunk.js": "./static/js/99.bb3d2c54.chunk.js",
"main.css": "./static/css/main.c0718fb6.css",
- "main.js": "./static/js/main.1f0e4c92.js",
+ "main.js": "./static/js/main.bcb3d45e.js",
"static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
"static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",
diff --git a/public/react/build/index.html b/public/react/build/index.html
index 76717acdd..a14514c8d 100644
--- a/public/react/build/index.html
+++ b/public/react/build/index.html
@@ -24,7 +24,7 @@
_host = 'https://ali-cdn.educoder.net/react/build/'
}
document.write('