From 08a6dec39d4cc6f2adfdd7e2b6d047bf77060921 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Fri, 4 Jul 2014 11:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=97=B6=E4=B8=BB=E9=A2=98=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb              | 9 ++++-----
 app/views/messages/_form.html.erb | 7 +++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/models/course.rb b/app/models/course.rb
index ff5e4fbd8..bf6190c88 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -38,6 +38,7 @@ class Course < ActiveRecord::Base
   validates_format_of  :class_period, :with =>/^[1-9]\d*$/
   validates_format_of  :name,:with =>/^[a-zA-Z0-9_\u4e00-\u9fa5]+$/
 
+  before_save :self_validate
   after_save :create_board_sync
   before_destroy :delete_all_members
 
@@ -77,7 +78,7 @@ class Course < ActiveRecord::Base
       where(nil)
     else
       pattern = "%#{arg.to_s.strip.downcase}%"
-      where("LOWER(extra) LIKE :p OR LOWER(name) LIKE :p ", :p => pattern)
+      where(" LOWER(name) LIKE :p ", :p => pattern)
     end
   }
 
@@ -166,10 +167,8 @@ class Course < ActiveRecord::Base
   end
 
   #自定义验证
-  def validate
-    if  !class_period.match([0-9])
-      errors.add_to_base("class period can only digital")
-    end
+  def self_validate
+
   end
 
   # 创建课程讨论区
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 6324cec36..b3ffbe3e0 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -4,7 +4,7 @@
 <div class="box ph10_5">
 <!--[form:message]-->
 <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br />
-<%= f.text_field :subject,:size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
+<%= f.text_field :subject,:size => 60, :style => "width: 99%;", :id => "message_subject",:readonly=>true %><!--by young-->
 </p>
 <p>
 <% unless replying %>
@@ -30,9 +30,12 @@
 <p>
 <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
 <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %></p>
-<%= wikitoolbar_for 'message_content' %>
+
 <!--[eoform:message]-->
 
 <p><%= l(:label_attachment_plural) %><br />
 <%= render :partial => 'attachments/form', :locals => {:container => @message} %></p>
 </div>
+
+
+<%#= wikitoolbar_for 'message_content' %>
\ No newline at end of file