Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into project_pack

project_pack
杨树明 6 years ago
commit 4e6dfb0b7d

@ -792,7 +792,7 @@ class ShixunsController < ApplicationController
shixun_script = modify_shixun_script @shixun, shixun_script
end
end
#@shixun.evaluate_script = shixun_script
@shixun.evaluate_script = shixun_script
ActiveRecord::Base.transaction do
begin

@ -7,7 +7,7 @@
<!-- <span class="fl mr5 ml3">/</span>-->
<%= link_to @shixun.name, shixun_path(@shixun), :class => "edu-info-dark fl task-hide",:style=>"max-width:300px", :target => "_blank" %>
</p>
<% if User.current.has_teacher_role(@homework.course) || User.current.admin? || @work.user == User.current %>
<% if User.current.has_teacher_role(@homework.course) || User.current.admin? || User.current.business? || @work.user == User.current %>
<div class="fl mt5 ml10" data-tip-down="实战中获得的总经验值">
<span class="color-green">经验值:<%= @myshixun.total_score %> </span>
</div>

Loading…
Cancel
Save