Merge branch 'educoder' into dev_aliyun

app/controllers/account_controller.rb

@@ -214,7 +214,7 @@ class AccountController < ApplicationController
     content = "<p>[#{params[:question_kind]}]</p>" + "<p>问题页面网址：#{params[:url]}</p>" + params[:description]
     PrivateMessage.create(:user_id => User.current.id, :target_id => 1, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 1)
     PrivateMessage.create(:user_id => 1, :target_id => User.current.id, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 0)
-    redirect_to message_detail_user_path(User.current, :user_id => 1)
+    redirect_to "/messages/#{User.current.login}/message_detail?target_ids=1"
   end
 
   # 合作伙伴

app/views/managements/evaluate_simple.html.erb

@@ -36,7 +36,8 @@
           <td><%= record.front_js %></td>
           <td><%= record.test_cases %></td>
           <td><%= format_time record.created_at %></td>
-          <td><%= record.shixun.try(:exec_time) %></td>
+          <% challenge = Game.find(record.game_id).challenge %>
+          <td><%= challenge.try(:exec_time) %></td>
           <td><%= record.shixun.try(:identifier) %></td>
           <td><%= link_to record.shixun.try(:name), task_path(record.game), :target => "_blank", :title => "#{record.shixun.try(:name)}" %></td>
         </tr>

public/react/src/modules/tpm/NewHeader.js

@@ -526,9 +526,9 @@ class NewHeader extends Component {
                                        }
 
                                 </li>
-                                {/* <li>
+                                 <li>
                                     <a href="/applied_project/applied_join" data-remote="true">加入项目</a>
-                                </li> */}
+                                </li>
                             </ul>
 				      	</div>
 				    </div>