diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index b7b208842..cbedf74b2 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -5,7 +5,7 @@ class SubjectsController < ApplicationController before_action :find_subject, except: [:index, :create, :new, :append_to_stage] before_action :allowed, only: [:update, :edit, :destroy, :publish, :cancel_publish, :cancel_has_publish, :search_members, :add_subject_members, :statistics, :shixun_report, :school_report, - :up_member_position, :down_member_position] + :up_member_position, :down_member_position, :update_team_title] include ApplicationHelper include SubjectsHelper @@ -264,6 +264,12 @@ class SubjectsController < ApplicationController end end + def update_team_title + tip_exception("team_title参数不能为空") if params[:team_title].blank? + @subject.update_attributes!(team_title: params[:team_title]) + normal_status("更新成功") + end + def search_members tip_exception("搜索内容不能为空") unless params[:search] page = params[:page] || 1 diff --git a/app/views/subjects/right_banner.json.jbuilder b/app/views/subjects/right_banner.json.jbuilder index da8161a98..ef5645f26 100644 --- a/app/views/subjects/right_banner.json.jbuilder +++ b/app/views/subjects/right_banner.json.jbuilder @@ -5,6 +5,8 @@ json.members @members do |member| json.role member.role end +json.team_title @subject.team_title + # 技能标签 json.tags @tags do |tag| unless tag.blank? diff --git a/config/routes.rb b/config/routes.rb index 3cf18fe75..e6d7add91 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1077,6 +1077,7 @@ Rails.application.routes.draw do post :cancel_homepage_show post :excellent post :cancel_excellent + post :update_team_title end end end diff --git a/db/migrate/20191104063136_add_team_title_to_subjects.rb b/db/migrate/20191104063136_add_team_title_to_subjects.rb new file mode 100644 index 000000000..d515a800a --- /dev/null +++ b/db/migrate/20191104063136_add_team_title_to_subjects.rb @@ -0,0 +1,5 @@ +class AddTeamTitleToSubjects < ActiveRecord::Migration[5.2] + def change + add_column :subjects, :team_title, :string, default: "教学团队" + end +end