Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/helpers/application_helper.rb

@@ -1187,7 +1187,9 @@ module ApplicationHelper
       end
       res
     rescue Exception => e
-      Rails.logger.error("post failed! #{e}")
+      Rails.logger.error("post failed! #{e.message}")
+      # 增加错误栈信息
+      e.backtrace.each { |msg| Rails.logger.error("post_backtrace: #{msg}") }
       raise("实训云平台繁忙（繁忙等级：#{status}）")
     end
   end
@@ -1198,7 +1200,7 @@ module ApplicationHelper
       res = Net::HTTP.get_response(uri).body
       res = JSON.parse(res)
     rescue => e
-      logger.error("get response failed ! #{e}")
+      logger.error("get response failed ! #{e.message}")
       raise("实训云平台繁忙（繁忙等级：84）")
     end
   end
@@ -6578,7 +6580,7 @@ def update_shixun_work_status homework
   myshixuns = Myshixun.where(:shixun_id => shixun.id, :user_id => student_works.map(&:user_id))
   myshixuns.each do |myshixun|
     work = student_works.where(:user_id => myshixun.user_id).first
-    member = homework.course.members.find_by(:user_id => work.user_id)
+    member = homework.course.members.find_by_user_id(work.user_id)
     setting_time = homework_group_setting homework, member.try(:course_group_id)
     games = myshixun.games.where(:challenge_id => challeng_ids)
     myshixun_endtime = games.select{|game| game.status == 2}.size == games.size ? games.map(&:end_time).max : nil

app/views/managements/_profession_index.html.erb

@@ -37,13 +37,13 @@
     <td><%= format_time career.created_at %></td>
     <td><%= format_time career.published_at %></td>
     <td>
-      <%# if !career.status %>
-<!--        <a href="javascript:void(0)" class="color-grey-6" onclick="post_confirm_box('<%= published_career_managements_path(:id => career.id) %>', '是否确定执行发布操作？')">发布</a>-->
-      <%# end %>
-<!--      <a href="<%#= edit_introduction_career_path(career) %>" class="color-grey-6" target="_blank">编辑</a>-->
-      <%# if !career.status %>
-<!--        <a href="javascript:void(0)" class="color-grey-6" onclick="delete_confirm_box_2('<%= delete_career_managements_path(:id => career.id) %>', '是否确定执行删除操作？')">删除</a>-->
-      <%# end %>
+      <% if !career.status %>
+        <a href="javascript:void(0)" class="color-grey-6" onclick="post_confirm_box('<%= published_career_managements_path(:id => career.id) %>', '是否确定执行发布操作？')">发布</a>
+      <% end %>
+      <a href="<%= edit_introduction_career_path(career) %>" class="color-grey-6" target="_blank">编辑</a>
+      <% if !career.status %>
+        <a href="javascript:void(0)" class="color-grey-6" onclick="delete_confirm_box_2('<%= delete_career_managements_path(:id => career.id) %>', '是否确定执行删除操作？')">删除</a>
+      <% end %>
     </td>
   </tr>
 <% end %>