From e94ed86eadccc738da9905474b68e262d9943d1d Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Tue, 1 Jul 2014 16:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86BUG=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_form.html.erb         |  2 +-
 app/views/users/_my_joinedcourse.html.erb |  2 +-
 db/schema.rb                              | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 931b472c7..6324cec36 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -3,7 +3,7 @@
 
 <div class="box ph10_5">
 <!--[form:message]-->
-<p><label for="message_subject"><%= l(:field_subject) %></label><br />
+<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-->
 </p>
 <p>
diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb
index 484380778..315204e7a 100644
--- a/app/views/users/_my_joinedcourse.html.erb
+++ b/app/views/users/_my_joinedcourse.html.erb
@@ -13,7 +13,7 @@
 <% else %>
 	<div class="user_course_list menu-div">
   <div class="menu">
-	<%= link_to"#{l(:label_course_view_student)}",course_path(course: 1), :class => 'icon icon-add' %>
+	<%= link_to"#{l(:label_course_view_student)}",courses_path, :class => 'icon icon-add' %>
     <ul>
       <li mode='doing' class="on">进行中</li>
       <li mode='end'>已完结</li>
diff --git a/db/schema.rb b/db/schema.rb
index 9962892da..cc3d68cba 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1041,11 +1041,13 @@ ActiveRecord::Schema.define(:version => 20140626012511) do
   end
 
   create_table "user_scores", :force => true do |t|
-    t.integer "user_id"
-    t.integer "collaboration"
-    t.integer "influence"
-    t.integer "skill"
-    t.integer "activity"
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
   end
 
   create_table "user_statuses", :force => true do |t|