修改前端和后端的问题
This commit is contained in:
parent
48e889daeb
commit
29264e52b2
|
@ -16,6 +16,8 @@ class PullRequestsController < ApplicationController
|
||||||
@close_issues_size = issues.where(status_id: 5).size
|
@close_issues_size = issues.where(status_id: 5).size
|
||||||
@assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size
|
@assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size
|
||||||
@my_published_size = issues.where(author_id: current_user&.id).size
|
@my_published_size = issues.where(author_id: current_user&.id).size
|
||||||
|
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
|
||||||
|
|
||||||
|
|
||||||
status_type = params[:status_type] || "1" #issue状态的选择
|
status_type = params[:status_type] || "1" #issue状态的选择
|
||||||
search_name = params[:search].to_s
|
search_name = params[:search].to_s
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
if @new_project
|
if @new_project
|
||||||
|
json.status 0
|
||||||
|
json.message "fork项目成功"
|
||||||
json.id @new_project.id
|
json.id @new_project.id
|
||||||
json.identifier @new_project.identifier
|
json.identifier @new_project.identifier
|
||||||
else
|
else
|
||||||
|
json.status -1
|
||||||
|
json.message "fork项目失败"
|
||||||
json.nil!
|
json.nil!
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,6 +6,7 @@ json.assign_me_count @assign_to_me_size
|
||||||
json.my_published_count @my_published_size
|
json.my_published_count @my_published_size
|
||||||
json.search_count @issues_size
|
json.search_count @issues_size
|
||||||
json.limit @limit
|
json.limit @limit
|
||||||
|
json.user_admin_or_member @user_admin_or_member
|
||||||
|
|
||||||
json.issues do
|
json.issues do
|
||||||
json.array! @issues.to_a do |issue|
|
json.array! @issues.to_a do |issue|
|
||||||
|
|
|
@ -69,14 +69,14 @@
|
||||||
"./static/js/159.95ed7a8f.chunk.js": "./static/js/159.95ed7a8f.chunk.js",
|
"./static/js/159.95ed7a8f.chunk.js": "./static/js/159.95ed7a8f.chunk.js",
|
||||||
"./static/js/16.c23b61ce.chunk.js": "./static/js/16.c23b61ce.chunk.js",
|
"./static/js/16.c23b61ce.chunk.js": "./static/js/16.c23b61ce.chunk.js",
|
||||||
"./static/js/160.da4c509c.chunk.js": "./static/js/160.da4c509c.chunk.js",
|
"./static/js/160.da4c509c.chunk.js": "./static/js/160.da4c509c.chunk.js",
|
||||||
"./static/js/161.dc90b4cd.chunk.js": "./static/js/161.dc90b4cd.chunk.js",
|
"./static/js/161.46d4f5e2.chunk.js": "./static/js/161.46d4f5e2.chunk.js",
|
||||||
"./static/js/162.af296485.chunk.js": "./static/js/162.af296485.chunk.js",
|
"./static/js/162.af296485.chunk.js": "./static/js/162.af296485.chunk.js",
|
||||||
"./static/js/163.8a55c680.chunk.js": "./static/js/163.8a55c680.chunk.js",
|
"./static/js/163.8a55c680.chunk.js": "./static/js/163.8a55c680.chunk.js",
|
||||||
"./static/js/164.982f968c.chunk.js": "./static/js/164.982f968c.chunk.js",
|
"./static/js/164.982f968c.chunk.js": "./static/js/164.982f968c.chunk.js",
|
||||||
"./static/js/165.d048e040.chunk.js": "./static/js/165.d048e040.chunk.js",
|
"./static/js/165.d048e040.chunk.js": "./static/js/165.d048e040.chunk.js",
|
||||||
"./static/js/166.c29e4695.chunk.js": "./static/js/166.c29e4695.chunk.js",
|
"./static/js/166.c29e4695.chunk.js": "./static/js/166.c29e4695.chunk.js",
|
||||||
"./static/js/167.f2c4016d.chunk.js": "./static/js/167.f2c4016d.chunk.js",
|
"./static/js/167.f2c4016d.chunk.js": "./static/js/167.f2c4016d.chunk.js",
|
||||||
"./static/js/168.e4c3724c.chunk.js": "./static/js/168.e4c3724c.chunk.js",
|
"./static/js/168.911e1758.chunk.js": "./static/js/168.911e1758.chunk.js",
|
||||||
"./static/js/169.91cb36dd.chunk.js": "./static/js/169.91cb36dd.chunk.js",
|
"./static/js/169.91cb36dd.chunk.js": "./static/js/169.91cb36dd.chunk.js",
|
||||||
"./static/js/17.81f9c158.chunk.js": "./static/js/17.81f9c158.chunk.js",
|
"./static/js/17.81f9c158.chunk.js": "./static/js/17.81f9c158.chunk.js",
|
||||||
"./static/js/170.5ff8a01e.chunk.js": "./static/js/170.5ff8a01e.chunk.js",
|
"./static/js/170.5ff8a01e.chunk.js": "./static/js/170.5ff8a01e.chunk.js",
|
||||||
|
@ -102,7 +102,7 @@
|
||||||
"./static/js/189.3e8d523d.chunk.js": "./static/js/189.3e8d523d.chunk.js",
|
"./static/js/189.3e8d523d.chunk.js": "./static/js/189.3e8d523d.chunk.js",
|
||||||
"./static/js/19.37fb291a.chunk.js": "./static/js/19.37fb291a.chunk.js",
|
"./static/js/19.37fb291a.chunk.js": "./static/js/19.37fb291a.chunk.js",
|
||||||
"./static/js/190.cb251023.chunk.js": "./static/js/190.cb251023.chunk.js",
|
"./static/js/190.cb251023.chunk.js": "./static/js/190.cb251023.chunk.js",
|
||||||
"./static/js/191.95ad9f46.chunk.js": "./static/js/191.95ad9f46.chunk.js",
|
"./static/js/191.6d0ffeac.chunk.js": "./static/js/191.6d0ffeac.chunk.js",
|
||||||
"./static/js/192.f4f11544.chunk.js": "./static/js/192.f4f11544.chunk.js",
|
"./static/js/192.f4f11544.chunk.js": "./static/js/192.f4f11544.chunk.js",
|
||||||
"./static/js/193.2c7023c8.chunk.js": "./static/js/193.2c7023c8.chunk.js",
|
"./static/js/193.2c7023c8.chunk.js": "./static/js/193.2c7023c8.chunk.js",
|
||||||
"./static/js/194.db7b2b3e.chunk.js": "./static/js/194.db7b2b3e.chunk.js",
|
"./static/js/194.db7b2b3e.chunk.js": "./static/js/194.db7b2b3e.chunk.js",
|
||||||
|
@ -239,7 +239,7 @@
|
||||||
"./static/js/59.d934b58f.chunk.js": "./static/js/59.d934b58f.chunk.js",
|
"./static/js/59.d934b58f.chunk.js": "./static/js/59.d934b58f.chunk.js",
|
||||||
"./static/js/6.59633da2.chunk.js": "./static/js/6.59633da2.chunk.js",
|
"./static/js/6.59633da2.chunk.js": "./static/js/6.59633da2.chunk.js",
|
||||||
"./static/js/60.766c7736.chunk.js": "./static/js/60.766c7736.chunk.js",
|
"./static/js/60.766c7736.chunk.js": "./static/js/60.766c7736.chunk.js",
|
||||||
"./static/js/61.eb21963f.chunk.js": "./static/js/61.eb21963f.chunk.js",
|
"./static/js/61.990d0842.chunk.js": "./static/js/61.990d0842.chunk.js",
|
||||||
"./static/js/62.8835b3ff.chunk.js": "./static/js/62.8835b3ff.chunk.js",
|
"./static/js/62.8835b3ff.chunk.js": "./static/js/62.8835b3ff.chunk.js",
|
||||||
"./static/js/63.105ad145.chunk.js": "./static/js/63.105ad145.chunk.js",
|
"./static/js/63.105ad145.chunk.js": "./static/js/63.105ad145.chunk.js",
|
||||||
"./static/js/64.0c3cef19.chunk.js": "./static/js/64.0c3cef19.chunk.js",
|
"./static/js/64.0c3cef19.chunk.js": "./static/js/64.0c3cef19.chunk.js",
|
||||||
|
@ -252,8 +252,8 @@
|
||||||
"./static/js/70.c8ba503f.chunk.js": "./static/js/70.c8ba503f.chunk.js",
|
"./static/js/70.c8ba503f.chunk.js": "./static/js/70.c8ba503f.chunk.js",
|
||||||
"./static/js/71.5effdcde.chunk.js": "./static/js/71.5effdcde.chunk.js",
|
"./static/js/71.5effdcde.chunk.js": "./static/js/71.5effdcde.chunk.js",
|
||||||
"./static/js/72.e4fc7f56.chunk.js": "./static/js/72.e4fc7f56.chunk.js",
|
"./static/js/72.e4fc7f56.chunk.js": "./static/js/72.e4fc7f56.chunk.js",
|
||||||
"./static/js/73.15af31ec.chunk.js": "./static/js/73.15af31ec.chunk.js",
|
"./static/js/73.03a9b794.chunk.js": "./static/js/73.03a9b794.chunk.js",
|
||||||
"./static/js/74.1b2d6220.chunk.js": "./static/js/74.1b2d6220.chunk.js",
|
"./static/js/74.5d48bab8.chunk.js": "./static/js/74.5d48bab8.chunk.js",
|
||||||
"./static/js/75.a057e1bd.chunk.js": "./static/js/75.a057e1bd.chunk.js",
|
"./static/js/75.a057e1bd.chunk.js": "./static/js/75.a057e1bd.chunk.js",
|
||||||
"./static/js/76.463add77.chunk.js": "./static/js/76.463add77.chunk.js",
|
"./static/js/76.463add77.chunk.js": "./static/js/76.463add77.chunk.js",
|
||||||
"./static/js/77.77f3b65a.chunk.js": "./static/js/77.77f3b65a.chunk.js",
|
"./static/js/77.77f3b65a.chunk.js": "./static/js/77.77f3b65a.chunk.js",
|
||||||
|
@ -282,7 +282,7 @@
|
||||||
"./static/js/98.e196cdfc.chunk.js": "./static/js/98.e196cdfc.chunk.js",
|
"./static/js/98.e196cdfc.chunk.js": "./static/js/98.e196cdfc.chunk.js",
|
||||||
"./static/js/99.2d19140c.chunk.js": "./static/js/99.2d19140c.chunk.js",
|
"./static/js/99.2d19140c.chunk.js": "./static/js/99.2d19140c.chunk.js",
|
||||||
"main.css": "./static/css/main.fd229636.css",
|
"main.css": "./static/css/main.fd229636.css",
|
||||||
"main.js": "./static/js/main.298d216b.js",
|
"main.js": "./static/js/main.d541989c.js",
|
||||||
"static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
|
"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.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
|
||||||
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",
|
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
_host = 'https://ali-cdn.educoder.net/react/build/'
|
_host = 'https://ali-cdn.educoder.net/react/build/'
|
||||||
}
|
}
|
||||||
document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
|
document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
|
||||||
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.298d216b.js"><\/script>');
|
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.d541989c.js"><\/script>');
|
||||||
})()
|
})()
|
||||||
</script>
|
</script>
|
||||||
<script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>
|
<script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue