diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index dc70f80c7..110e58951 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -201,25 +201,16 @@ class PullRequestsController < ApplicationController
issue_files = params[:attachment_ids]
change_files = false
issue_file_ids = []
+
if issue_files.present?
- issue_attachments = @issue&.attachments
- issue_file_ids = issue_attachments&.pluck(:id)
- left_file_ids = issue_file_ids - issue_files
- new_file_ids = issue_files - issue_file_ids
- if left_file_ids.size > 0
- change_files = true
- issue_attachments.where(id: left_file_ids).delete_all
- end
- if new_file_ids.size > 0
- change_files = true
- new_file_ids.each do |id|
- attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
- unless attachment.blank?
- attachment.container = @issue
- attachment.author_id = current_user.id
- attachment.description = ""
- attachment.save
- end
+ change_files = true
+ issue_files.each do |id|
+ attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+ unless attachment.blank?
+ attachment.container = @issue
+ attachment.author_id = current_user.id
+ attachment.description = ""
+ attachment.save
end
end
end
diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder
index 9082e6243..dd2516ca6 100644
--- a/app/views/projects/index.json.jbuilder
+++ b/app/views/projects/index.json.jbuilder
@@ -4,6 +4,7 @@ json.projects do
json.partial! 'project', project: project
json.author do
json.name project.owner.login
+ json.login project.owner.login
json.image_url url_to_avatar(project.owner)
end
json.category do
diff --git a/public/react/build/asset-manifest.json b/public/react/build/asset-manifest.json
index ab551dcd5..576b54957 100644
--- a/public/react/build/asset-manifest.json
+++ b/public/react/build/asset-manifest.json
@@ -68,7 +68,7 @@
"./static/js/158.b8182b3b.chunk.js": "./static/js/158.b8182b3b.chunk.js",
"./static/js/159.853da2bd.chunk.js": "./static/js/159.853da2bd.chunk.js",
"./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js",
- "./static/js/160.24f63c24.chunk.js": "./static/js/160.24f63c24.chunk.js",
+ "./static/js/160.2c9c9014.chunk.js": "./static/js/160.2c9c9014.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",
@@ -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.b7e3a0f2.chunk.js": "./static/js/182.b7e3a0f2.chunk.js",
+ "./static/js/182.e0676ef7.chunk.js": "./static/js/182.e0676ef7.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",
@@ -227,7 +227,7 @@
"./static/js/56.31429d59.chunk.js": "./static/js/56.31429d59.chunk.js",
"./static/js/57.d2da64a0.chunk.js": "./static/js/57.d2da64a0.chunk.js",
"./static/js/58.2165cb51.chunk.js": "./static/js/58.2165cb51.chunk.js",
- "./static/js/59.d83cf48e.chunk.js": "./static/js/59.d83cf48e.chunk.js",
+ "./static/js/59.c483fe76.chunk.js": "./static/js/59.c483fe76.chunk.js",
"./static/js/6.bb495cba.chunk.js": "./static/js/6.bb495cba.chunk.js",
"./static/js/60.d0d3ef52.chunk.js": "./static/js/60.d0d3ef52.chunk.js",
"./static/js/61.42df9549.chunk.js": "./static/js/61.42df9549.chunk.js",
@@ -247,7 +247,7 @@
"./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.561da811.chunk.js": "./static/js/77.561da811.chunk.js",
+ "./static/js/77.f491ec5f.chunk.js": "./static/js/77.f491ec5f.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",
@@ -263,7 +263,7 @@
"./static/js/89.b46c0b37.chunk.js": "./static/js/89.b46c0b37.chunk.js",
"./static/js/9.6f9ef4ac.chunk.js": "./static/js/9.6f9ef4ac.chunk.js",
"./static/js/90.ebdbda62.chunk.js": "./static/js/90.ebdbda62.chunk.js",
- "./static/js/91.fc359bf8.chunk.js": "./static/js/91.fc359bf8.chunk.js",
+ "./static/js/91.f276e8e2.chunk.js": "./static/js/91.f276e8e2.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.fa90d379.chunk.js": "./static/js/94.fa90d379.chunk.js",
@@ -273,7 +273,7 @@
"./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.e069f5e6.js",
+ "main.js": "./static/js/main.a59b16ab.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 a36d240fe..11696a530 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('