pre_develop
jingquan huang 6 years ago
parent e8e65c8572
commit 7e87cd2f82

@ -57,7 +57,7 @@ class Shixun < ActiveRecord::Base
scope :visible, lambda{where(status: [2,3])} scope :visible, lambda{where(status: [2,3])}
scope :min, lambda { select([:id, :name, :gpid, :modify_time, :reset_time, :language, :propaedeutics, :status, :identifier, scope :min, lambda { select([:id, :name, :gpid, :modify_time, :reset_time, :language, :propaedeutics, :status, :identifier,
:test_set_permission, :hide_code, :forbid_copy, :hidden, :webssh, :user_id, :code_hidden, :test_set_permission, :hide_code, :forbid_copy, :hidden, :webssh, :user_id, :code_hidden,
:task_pass, :exec_time, :multi_webssh]) } :task_pass, :exec_time, :multi_webssh, :vnc]) }
scope :published, lambda{where(status: 2)} scope :published, lambda{where(status: 2)}
scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) } scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) }

@ -156,7 +156,7 @@
<label style="top:6px" class="color-grey-6" for="can_copy">勾选则允许认证教师复制该实训</label> <label style="top:6px" class="color-grey-6" for="can_copy">勾选则允许认证教师复制该实训</label>
</li> </li>
</div> </div>
<% if Redmine::Configuration['gitlab_address'].include?("test") %> <% if User.current.admin? %>
<div class="mb10 edu-back-white padding30-20"> <div class="mb10 edu-back-white padding30-20">
<p class="color-grey-6 font-16 mb10">VNC图形化</p> <p class="color-grey-6 font-16 mb10">VNC图形化</p>
<li class="mb20"> <li class="mb20">

@ -211,7 +211,7 @@
</span> </span>
</div> </div>
<% if Redmine::Configuration['gitlab_address'].include?("test") %> <% if User.current.admin? %>
<div class="clearfix mt20"> <div class="clearfix mt20">
<span class="color-grey-6 mt5 fl" style="min-width: 95px;">VNC图形化:</span> <span class="color-grey-6 mt5 fl" style="min-width: 95px;">VNC图形化:</span>
<span class="fl"> <span class="fl">

Loading…
Cancel
Save