diff --git a/app/controllers/admins/laboratory_settings_controller.rb b/app/controllers/admins/laboratory_settings_controller.rb index 283afc175..b22122831 100644 --- a/app/controllers/admins/laboratory_settings_controller.rb +++ b/app/controllers/admins/laboratory_settings_controller.rb @@ -16,7 +16,7 @@ class Admins::LaboratorySettingsController < Admins::BaseController def form_params params.permit(:identifier, :name, - :nav_logo, :login_logo, :tab_logo, :oj_banner, + :nav_logo, :login_logo, :tab_logo, :oj_banner, :shixun_banner, :subject_banner, :course_banner, :competition_banner, :moop_cases_banner, :footer, navbar: %i[name link hidden]) end diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb index c7fcb4423..103c33aab 100644 --- a/app/controllers/challenges_controller.rb +++ b/app/controllers/challenges_controller.rb @@ -230,7 +230,7 @@ class ChallengesController < ApplicationController logger.info("############shixun_publiced:#{@shixun.public == 0}") if @shixun.public == 0 script = modify_shixun_script @shixun, @shixun.evaluate_script - @shixun.shixun_info.update_column(:evaluate_script, script) + @shixun.shixun_info.update_column(:evaluate_script, script) if script.present? end # TODO: # if path != params[:challenge][:path] diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index 83bcaf37a..fb327ec78 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1433,7 +1433,7 @@ class HomeworkCommonsController < ApplicationController def require_id_params tip_exception("请至少选择一个作业") if params[:homework_ids].blank? - tip_exception("批量设置不能超过15个") if params[:homework_ids].length > 15 + tip_exception("批量设置不能超过15个") if params[:homework_ids].length > 15 && params[:type].blank? end def validate_min_max_num diff --git a/app/models/ecloud.rb b/app/models/ecloud.rb index 293948f3d..f2648093c 100644 --- a/app/models/ecloud.rb +++ b/app/models/ecloud.rb @@ -1,8 +1,8 @@ #encoding=utf-8 class Ecloud < ActiveRecord::Base - attr_accessible :applyno, :begintime, :bossorderid, :custcode, :custid, :custname, :custtype, :ecordercode, :endtime, - :mobile, :opttype, :productcode, :registersource, :string, :trial, :useralias, :userid, :username, :email, - :effecttime, :operatime + # attr_accessible :applyno, :begintime, :bossorderid, :custcode, :custid, :custname, :custtype, :ecordercode, :endtime, + # :mobile, :opttype, :productcode, :registersource, :string, :trial, :useralias, :userid, :username, :email, + # :effecttime, :operatime has_many :ecloud_services, :dependent => :destroy # 业务列表 has_many :ecloud_productparas, :dependent => :destroy # 开通参数列表 diff --git a/app/models/ecloud_productpara.rb b/app/models/ecloud_productpara.rb index ec1b94bc5..a88fc9d6c 100644 --- a/app/models/ecloud_productpara.rb +++ b/app/models/ecloud_productpara.rb @@ -1,4 +1,4 @@ class EcloudProductpara < ActiveRecord::Base - attr_accessible :key, :value, :ecloud_id + # attr_accessible :key, :value, :ecloud_id belongs_to :ecloud end diff --git a/app/models/ecloud_service.rb b/app/models/ecloud_service.rb index dba4a7b20..cb171b297 100644 --- a/app/models/ecloud_service.rb +++ b/app/models/ecloud_service.rb @@ -1,6 +1,6 @@ # 操作代码 0：新增业务，1：注销业务2：修改业务 class EcloudService < ActiveRecord::Base - attr_accessible :begintime, :code, :endtime, :opttype, :ecloud_id, :packagecode, :bossorderid + # attr_accessible :begintime, :code, :endtime, :opttype, :ecloud_id, :packagecode, :bossorderid belongs_to :ecloud has_many :ecloud_serviece_serviceparas end diff --git a/app/models/ecloud_serviece_servicepara.rb b/app/models/ecloud_serviece_servicepara.rb index 5dbff71f5..f73a3f712 100644 --- a/app/models/ecloud_serviece_servicepara.rb +++ b/app/models/ecloud_serviece_servicepara.rb @@ -1,5 +1,5 @@ # ket值，license表示人数，对应企业版；duration表示月数，对应个人版； class EcloudServieceServicepara < ActiveRecord::Base - attr_accessible :key, :value, :ecloud_service_id + # attr_accessible :key, :value, :ecloud_service_id belongs_to :ecloud_service end diff --git a/app/models/ecloud_users.rb b/app/models/ecloud_users.rb index 99da0df24..8f29c8e2d 100644 --- a/app/models/ecloud_users.rb +++ b/app/models/ecloud_users.rb @@ -1,4 +1,4 @@ class EcloudUser < ActiveRecord::Base # opttype: # user['opttype']: 操作类型0：开通；1：变更；3: 取消授权；4：暂停；5：恢复； - attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid + # attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid end diff --git a/app/models/laboratory_setting.rb b/app/models/laboratory_setting.rb index e53b54cd3..63949f4ef 100644 --- a/app/models/laboratory_setting.rb +++ b/app/models/laboratory_setting.rb @@ -30,6 +30,10 @@ class LaboratorySetting < ApplicationRecord image_url('_subject_banner') end + def shixun_banner_url + image_url('_shixun_banner') + end + def course_banner_url image_url('_course_banner') end @@ -62,7 +66,7 @@ class LaboratorySetting < ApplicationRecord name: nil, navbar: [ { 'name' => '实践课程', 'link' => '/paths', 'hidden' => false }, - { 'name' => '翻转课堂', 'link' => '/courses', 'hidden' => false }, + { 'name' => '教学课堂', 'link' => '/courses', 'hidden' => false }, { 'name' => '实训项目', 'link' => '/shixuns', 'hidden' => false }, { 'name' => '在线竞赛', 'link' => '/competitions', 'hidden' => false }, { 'name' => '教学案例', 'link' => '/moop_cases', 'hidden' => false }, diff --git a/app/models/shixun_info.rb b/app/models/shixun_info.rb index c2498067f..3d3f40c92 100644 --- a/app/models/shixun_info.rb +++ b/app/models/shixun_info.rb @@ -2,10 +2,12 @@ class ShixunInfo < ApplicationRecord belongs_to :shixun validates_uniqueness_of :shixun_id validates_length_of :fork_reason, maximum: 60, message: "不能超过60个字符" + validates_presence_of :evaluate_script, message: "实训脚本不能为空" after_commit :create_diff_record validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" } + private def create_diff_record diff --git a/app/services/admins/save_laboratory_setting_service.rb b/app/services/admins/save_laboratory_setting_service.rb index c29e374bd..89dfbb0e0 100644 --- a/app/services/admins/save_laboratory_setting_service.rb +++ b/app/services/admins/save_laboratory_setting_service.rb @@ -40,6 +40,7 @@ class Admins::SaveLaboratorySettingService < ApplicationService save_image_file(params[:login_logo], 'login') save_image_file(params[:tab_logo], 'tab') save_image_file(params[:subject_banner], '_subject_banner') + save_image_file(params[:shixun_banner], '_shixun_banner') save_image_file(params[:course_banner], '_course_banner') save_image_file(params[:competition_banner], '_competition_banner') save_image_file(params[:moop_cases_banner], '_moop_cases_banner') diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb index ee9880fbb..415f7077c 100644 --- a/app/views/admins/laboratory_settings/show.html.erb +++ b/app/views/admins/laboratory_settings/show.html.erb @@ -100,9 +100,19 @@ + +