Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
This commit is contained in:
commit
f1c0347ee2
|
@ -56,8 +56,8 @@
|
|||
<% else %>
|
||||
<% work= params[:show_work_id].nil? ? @homework.student_works.where("user_id = ?",User.current.id).first : StudentWork.find(params[:show_work_id]) %>
|
||||
<% end %>
|
||||
location.hash = "<%=work.id %>";
|
||||
<% unless work.nil? %>
|
||||
location.hash = "<%=work.id %>";
|
||||
<% if @homework.homework_type == 2 %>
|
||||
$("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc"),:is_focus => @is_focus}) %>");
|
||||
|
||||
|
|
Loading…
Reference in New Issue