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

app/helpers/application_helper.rb

@@ -130,15 +130,15 @@ module ApplicationHelper
       if source.class.to_s == 'User'
         File.join(relative_path, ["#{source.class}", "#{source.id}"])
       else
-        File.join("avatars", ["#{source.class}", "#{source.id}"])
+        File.join("images/avatars", ["#{source.class}", "#{source.id}"])
       end
     elsif source.class.to_s == 'User'
       str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
       File.join(relative_path, "#{source.class}", str)
     elsif source.class.to_s == 'Subject'
-      File.join("educoder", "index", "subject", "subject#{rand(17)}.jpg")
+      File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg")
     elsif source.class.to_s == 'Shixun'
-      File.join("educoder","index", "shixun", "shixun#{rand(23)}.jpg")
+      File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
     end
   end
 

public/react/src/modules/courses/busyWork/CommonWorkSetting.js

@@ -722,7 +722,7 @@ class CommonWorkSetting extends Component{
       late_time: late_time ? new Date(late_time) : late_time,         // 补交截止时间
       anonymous_comment: anonymous_comment,   // true: 启用匿评 false:未启用匿评
       evaluation_start: evaluation_start ? new Date(evaluation_start) : evaluation_start, //匿评开始时间
-      evaluation_end: evaluation_end,
+      evaluation_end: evaluation_end ? new Date(evaluation_end) : evaluation_end, 
       evaluation_num: evaluation_num,     //	匿评数
       absence_penalty: absence_penalty,   // 匿评扣分
       anonymous_appeal: anonymous_appeal, // true: 启用匿评申诉, false:未启用

public/react/src/modules/message/js/MessagSub.js

@@ -412,7 +412,7 @@ class MessagSub extends Component{
 				return window.open(`/projects/${item.parent_container_id}/issues?remote=true`)
 			case "Issue" :
 				//项目Issue页 :id = container_id
-				return window.open(`/projects/${item.container_id}/issues?remote=true`)
+				return window.open(`/issues/${item.container_id}`)
 			case "PullRequest" :
 				// 项目pull request页 :id = parent_container_id
 				return window.open(`/projects/${item.parent_container_id}/pull_requests`)
@@ -441,6 +441,8 @@ class MessagSub extends Component{
 					return window.open(`/crowdsourcing/${item.container_id}`)
 				// }
 				}
+				case "Discuss":
+					return window.open(`/shixuns/${item.identifier}/shixun_discuss`);
 			default :
 				return 	window.open("/")
 		}