From 86e637a6f999674ea2a2a81c1cc089f1c70ac9c4 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 31 Dec 2019 16:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E7=82=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/tag_disciplines_controller.rb   |  2 +-
 app/models/tag_discipline.rb                           |  1 +
 app/views/admins/tag_disciplines/shared/_list.html.erb | 10 +++++++++-
 .../20191231064614_add_user_id_to_tag_discipline.rb    |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admins/tag_disciplines_controller.rb b/app/controllers/admins/tag_disciplines_controller.rb
index c1bfee0dc..352146bcd 100644
--- a/app/controllers/admins/tag_disciplines_controller.rb
+++ b/app/controllers/admins/tag_disciplines_controller.rb
@@ -8,7 +8,7 @@ class Admins::TagDisciplinesController < Admins::BaseController
   def create
     name = params[:name].to_s.strip
     return render_error('名称重复') if current_sub_discipline.tag_disciplines.where(name: name).exists?
-    TagDiscipline.create!(name: name, sub_discipline_id: current_sub_discipline.id)
+    TagDiscipline.create!(name: name, sub_discipline_id: current_sub_discipline.id, user_id: current_user.id)
     render_ok
   end
 
diff --git a/app/models/tag_discipline.rb b/app/models/tag_discipline.rb
index e709e35e5..24567505e 100644
--- a/app/models/tag_discipline.rb
+++ b/app/models/tag_discipline.rb
@@ -1,5 +1,6 @@
 class TagDiscipline < ApplicationRecord
   belongs_to :sub_discipline
+  belongs_to :user
   has_many :tag_discipline_containers, dependent: :destroy
 
   def discipline
diff --git a/app/views/admins/tag_disciplines/shared/_list.html.erb b/app/views/admins/tag_disciplines/shared/_list.html.erb
index f6d92d366..2c91d88fa 100644
--- a/app/views/admins/tag_disciplines/shared/_list.html.erb
+++ b/app/views/admins/tag_disciplines/shared/_list.html.erb
@@ -2,7 +2,8 @@
   <thead class="thead-light">
   <tr>
     <th width="6%">序号</th>
-    <th width="54%" class="text-left">知识点</th>
+    <th width="42%" class="text-left">知识点</th>
+    <th width="12%">创建者</th>
     <th width="8%">实践课程</th>
     <th width="8%">实训</th>
     <th width="8%">题库</th>
@@ -15,6 +16,13 @@
       <tr class="tag-discipline-item tag-discipline-item-<%= tag.id %>">
         <td><%= index + 1 %></td>
         <td class="text-left"><%= tag.name %></td>
+        <td>
+          <% if tag.user.present? %>
+            <%= link_to tag.user.real_name, user_path(tag.user), :target => "_blank" %>
+          <% else %>
+            --
+          <% end %>
+        </td>
         <td>
           <% disabled = !(tag.sub_discipline&.subject && tag.discipline&.subject) %>
           <%= check_box_tag :subject,!tag.subject,tag.subject,disabled:disabled,remote:true,data:{id:tag.id},class:"tag-discipline-source-form" %>
diff --git a/db/migrate/20191231064614_add_user_id_to_tag_discipline.rb b/db/migrate/20191231064614_add_user_id_to_tag_discipline.rb
index c5175eb3e..4de5b8f0a 100644
--- a/db/migrate/20191231064614_add_user_id_to_tag_discipline.rb
+++ b/db/migrate/20191231064614_add_user_id_to_tag_discipline.rb
@@ -1,5 +1,5 @@
 class AddUserIdToTagDiscipline < ActiveRecord::Migration[5.2]
   def change
-
+    add_column :tag_disciplines, :user_id, :integer
   end
 end