diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 3cbfc8466..a0ef84798 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -563,13 +563,23 @@ class OrganizationsController < ApplicationController # 设置为名师 def set_excellent_teacher @ex_teacher = User.find(params[:user]) - params[:type] == "student" ? @ex_teacher.update_column(:excellent_student, 1) : @ex_teacher.update_column(:excellent_teacher, 1) + @ex_teacher.update_column(:excellent_teacher, 1) end # 取消名师 def reset_excellent_teacher @ex_teacher = User.find(params[:user]) - params[:type] == "student" ? @ex_teacher.update_column(:excellent_student, 0) : @ex_teacher.update_column(:excellent_teacher, 0) + @ex_teacher.update_column(:excellent_teacher, 0) + end + + def set_excellent_student + @ex_student = User.find(params[:user]) + @ex_student.update_column(:excellent_student, 1) + end + + def reset_excellent_student + @ex_student = User.find(params[:user]) + @ex_student.update_column(:excellent_student, 0) end def hide_org_subfield diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb index cc6920f33..e05d52747 100644 --- a/app/views/organizations/_org_custom_header.html.erb +++ b/app/views/organizations/_org_custom_header.html.erb @@ -21,10 +21,10 @@
  • 注册
  • <% end %> - + + + +
    diff --git a/app/views/organizations/_org_students_list.html.erb b/app/views/organizations/_org_students_list.html.erb index 4f768d29f..d3db6fbf6 100644 --- a/app/views/organizations/_org_students_list.html.erb +++ b/app/views/organizations/_org_students_list.html.erb @@ -33,12 +33,12 @@ function hide(content, id){ if (content.text() == '设为学霸') $.ajax({ - url: "/organizations/set_excellent_teacher?user=" + id + "&type=student", + url: "/organizations/set_excellent_student?user=" + id , type: "post" }); else $.ajax({ - url: "/organizations/reset_excellent_teacher?user=" + id + "&type=student", + url: "/organizations/reset_excellent_student?user=" + id , type: "post" }); } diff --git a/app/views/organizations/reset_excellent_student.js.erb b/app/views/organizations/reset_excellent_student.js.erb new file mode 100644 index 000000000..29684c7e4 --- /dev/null +++ b/app/views/organizations/reset_excellent_student.js.erb @@ -0,0 +1 @@ +$("#hide_<%= @ex_student.id %>").text("设为学霸"); \ No newline at end of file diff --git a/app/views/organizations/reset_excellent_teacher.js.erb b/app/views/organizations/reset_excellent_teacher.js.erb index 8b7c6cc71..fdf160bc4 100644 --- a/app/views/organizations/reset_excellent_teacher.js.erb +++ b/app/views/organizations/reset_excellent_teacher.js.erb @@ -1 +1 @@ -$("#hide_<%= @ex_teacher.id %>").text(<%= params[:type]== "student" ? "设为学霸" : "设为名师"%>); \ No newline at end of file +$("#hide_<%= @ex_teacher.id %>").text("设为名师"); \ No newline at end of file diff --git a/app/views/organizations/set_excellent_student.js.erb b/app/views/organizations/set_excellent_student.js.erb new file mode 100644 index 000000000..a8bb963c8 --- /dev/null +++ b/app/views/organizations/set_excellent_student.js.erb @@ -0,0 +1 @@ +$("#hide_<%= @ex_student.id %>").text("取消设置"); \ No newline at end of file