From 49aa3a994ea0ff764d230c48edc29816e3eb6cf5 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Sat, 19 Jul 2014 15:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=97=B6=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb |  2 +-
 app/models/course.rb          |  2 +-
 db/schema.rb                  | 33 ++++++++++-----------------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 033b6405c..59acc188b 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -371,7 +371,7 @@ module CoursesHelper
 
   #获取作业的教师评分
   def teacher_score_for_homework homework
-    member = searchTeacherAndAssistant(homework.bid.courses.first).first#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first
+     member = searchTeacherAndAssistant(homework.bid.courses.first).first#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first
     if member.nil?
       return "0.00"
     end
diff --git a/app/models/course.rb b/app/models/course.rb
index 04b0535bd..1c2828adc 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -34,7 +34,7 @@ class Course < ActiveRecord::Base
   acts_as_attachable :view_permission => :view_files,
                      :delete_permission => :manage_files
 
-  validates_presence_of :password, :term,:name
+  validates_presence_of :password, :term,:name ,:class_period
   validates_format_of  :class_period, :with =>/^\d*$/
   #validates_format_of  :name,:with =>/^[a-zA-Z0-9_\u4e00-\u9fa5]+$/
 
diff --git a/db/schema.rb b/db/schema.rb
index 87e6be3f3..a94793913 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -809,18 +809,18 @@ ActiveRecord::Schema.define(:version => 20140719030941) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
+    t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -844,19 +844,6 @@ ActiveRecord::Schema.define(:version => 20140719030941) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1