From 0dfc887f74125e358fdc6cbf1385a5cfd40b28e6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 27 Jul 2016 16:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=8F=AD=E7=BA=A7=E4=B8=AD?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_copy_course.html.erb        |  2 +-
 ...20160727065357_add_column_to_member_role.rb | 16 ++++++++++++++++
 db/schema.rb                                   | 18 +++++++++++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20160727065357_add_column_to_member_role.rb

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 55217017b..9f45172bc 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -114,7 +114,7 @@
           <label class="fl">
             <input name="course_content_type[]" type="checkbox" value="1" class="resourceCopy"/>
             资源</label>
-            <span class="c_red ml5 fl mb10">复制到新班级的资源将在1个月后发布，请您调整资源的发布时间，否则学生可能看不到资源。</span>
+            <span class="c_red ml5 fl mb10">复制到新班级的资源将在1个月后发布，请您调整资源的发布时间，否则学生将看不到资源。</span>
         </li>
       </ul>
       <!--<ul class="fl" id="copyResource2">
diff --git a/db/migrate/20160727065357_add_column_to_member_role.rb b/db/migrate/20160727065357_add_column_to_member_role.rb
new file mode 100644
index 000000000..b551c18bd
--- /dev/null
+++ b/db/migrate/20160727065357_add_column_to_member_role.rb
@@ -0,0 +1,16 @@
+class AddColumnToMemberRole < ActiveRecord::Migration
+  def change
+    add_column :member_roles, :multi_role, :integer, :default => 0
+
+    count = MemberRole.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        MemberRole.page(i).per(30).each do |mr|
+          if mr.role_id == 3
+            mr.update_column('multi_role', 1)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3a92d4fc0..ac6ea0ca8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160720094503) do
+ActiveRecord::Schema.define(:version => 20160727065357) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -395,6 +395,17 @@ ActiveRecord::Schema.define(:version => 20160720094503) do
   add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
   add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
 
+  create_table "commits", :force => true do |t|
+    t.integer  "repository_id"
+    t.string   "version"
+    t.string   "committer"
+    t.text     "comments"
+    t.datetime "committed_on"
+    t.integer  "project_id"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
   create_table "contest_notifications", :force => true do |t|
     t.text     "title"
     t.text     "content"
@@ -1094,9 +1105,10 @@ ActiveRecord::Schema.define(:version => 20160720094503) do
   end
 
   create_table "member_roles", :force => true do |t|
-    t.integer "member_id",      :null => false
-    t.integer "role_id",        :null => false
+    t.integer "member_id",                     :null => false
+    t.integer "role_id",                       :null => false
     t.integer "inherited_from"
+    t.integer "multi_role",     :default => 0
   end
 
   add_index "member_roles", ["member_id"], :name => "index_member_roles_on_member_id"