From f2b036b65956380772604ab506205f731f8a5ef8 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 11 Sep 2019 15:44:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=96=E8=BE=91=E6=9D=83?=
=?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/shixuns_controller.rb | 2 +-
app/views/shixuns/settings.json.jbuilder | 1 +
.../20190911074019_add_code_edit_permission_for_shixun.rb | 6 ++++++
3 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 db/migrate/20190911074019_add_code_edit_permission_for_shixun.rb
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 7ba2c65fc..82bc9ce84 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -978,7 +978,7 @@ private
raise("实训名称不能为空") if params[:shixun][:name].blank?
params.require(:shixun).permit(:name, :trainee, :webssh, :can_copy, :use_scope, :vnc, :test_set_permission,
:task_pass, :multi_webssh, :opening_time, :mirror_script_id, :code_hidden,
- :hide_code, :forbid_copy, :vnc_evaluate)
+ :hide_code, :forbid_copy, :vnc_evaluate, :code_edit_permission)
end
def shixun_info_params
diff --git a/app/views/shixuns/settings.json.jbuilder b/app/views/shixuns/settings.json.jbuilder
index c9142dab0..3441a0a06 100644
--- a/app/views/shixuns/settings.json.jbuilder
+++ b/app/views/shixuns/settings.json.jbuilder
@@ -30,6 +30,7 @@ json.shixun do
json.scope_partment @shixun.schools.map(&:name) # 公开范围
json.opening_time @shixun.opening_time
json.forbid_copy @shixun.forbid_copy
+ json.code_edit_permission @shixun.code_edit_permission # tpi学员是否有编辑所有代码的权限
# 私密仓库
json.is_secret_repository @shixun.shixun_secret_repository.present?
diff --git a/db/migrate/20190911074019_add_code_edit_permission_for_shixun.rb b/db/migrate/20190911074019_add_code_edit_permission_for_shixun.rb
new file mode 100644
index 000000000..801713e0e
--- /dev/null
+++ b/db/migrate/20190911074019_add_code_edit_permission_for_shixun.rb
@@ -0,0 +1,6 @@
+class AddCodeEditPermissionForShixun < ActiveRecord::Migration[5.2]
+ def change
+
+ add_column :shixuns, :code_edit_permission, :boolean, default: false
+ end
+end