From 42f5b86d95dd0f2cdc6d72e9fb4d637990dcb159 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Dec 2015 10:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb                 | 3 ++-
 db/migrate/20151208015409_add_is_delete_to_courses.rb | 5 +++++
 db/schema.rb                                          | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20151208015409_add_is_delete_to_courses.rb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 8e61ad525..ffe22a29d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -771,8 +771,9 @@ class CoursesController < ApplicationController
       format.html {render :layout => 'base_courses'}
     end
   end
+
   #删除课程
-  #删除课程只是将课程的is_delete状态改为false，is_delete为false状态的课程只有管理员可以看到
+  #删除课程只是将课程的is_deleted状态改为false，is_deleted为false状态的课程只有管理员可以看到
   def destroy
 
   end
diff --git a/db/migrate/20151208015409_add_is_delete_to_courses.rb b/db/migrate/20151208015409_add_is_delete_to_courses.rb
new file mode 100644
index 000000000..d974fb4d9
--- /dev/null
+++ b/db/migrate/20151208015409_add_is_delete_to_courses.rb
@@ -0,0 +1,5 @@
+class AddIsDeleteToCourses < ActiveRecord::Migration
+  def change
+    add_column :courses, :is_delete, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 125d7495f..5b58e3385 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 => 20151204062220) do
+ActiveRecord::Schema.define(:version => 20151208015409) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -459,6 +459,7 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.integer  "open_student",                  :default => 0
     t.integer  "outline",                       :default => 0
     t.integer  "publish_resource",              :default => 0
+    t.integer  "is_delete"
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -1160,7 +1161,6 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
   create_table "org_members", :force => true do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
-    t.string   "role"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end