diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb
index 40049f104..7762a0798 100644
--- a/app/views/courses/_member.html.erb
+++ b/app/views/courses/_member.html.erb
@@ -1,6 +1,7 @@
<% @members.each do |member| %>
- <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
+ <%#= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
+ <%= link_to "#{member.principal}(#{member.principal.show_name})", user_path(member.principal), :class => "w150 c_orange fl" %>
<%= zh_course_role(h member.roles.sort.collect(&:to_s).join(', ')) %>
<%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
diff --git a/db/schema.rb b/db/schema.rb
index 4bfd0a42b..9ce76c447 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 => 20151208015409) do
+ActiveRecord::Schema.define(:version => 20151210110210) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -459,7 +459,7 @@ ActiveRecord::Schema.define(:version => 20151208015409) do
t.integer "open_student", :default => 0
t.integer "outline", :default => 0
t.integer "publish_resource", :default => 0
- t.integer "is_delete", :default => 0
+ t.integer "is_delete"
end
create_table "custom_fields", :force => true do |t|
@@ -544,23 +544,26 @@ ActiveRecord::Schema.define(:version => 20151208015409) do
add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
add_index "documents", ["project_id"], :name => "documents_project_id"
- create_table "dts", :force => true do |t|
- t.string "IPLineCode"
- t.string "Description"
- t.string "Num"
- t.string "Variable"
- t.string "TraceInfo"
- t.string "Method"
+ create_table "dts", :primary_key => "Num", :force => true do |t|
+ t.string "Defect", :limit => 50
+ t.string "Category", :limit => 50
t.string "File"
- t.string "IPLine"
- t.string "Review"
- t.string "Category"
- t.string "Defect"
- t.string "PreConditions"
- t.string "StartLine"
+ t.string "Method"
+ t.string "Module", :limit => 20
+ t.string "Variable", :limit => 50
+ t.integer "StartLine"
+ t.integer "IPLine"
+ t.string "IPLineCode", :limit => 200
+ t.string "Judge", :limit => 15
+ t.integer "Review", :limit => 1
+ t.string "Description"
+ t.text "PreConditions", :limit => 2147483647
+ t.text "TraceInfo", :limit => 2147483647
+ t.text "Code", :limit => 2147483647
t.integer "project_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ t.integer "id", :null => false
end
create_table "editor_of_documents", :force => true do |t|
@@ -898,16 +901,6 @@ ActiveRecord::Schema.define(:version => 20151208015409) do
add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
- create_table "journal_details_copy", :force => true do |t|
- t.integer "journal_id", :default => 0, :null => false
- t.string "property", :limit => 30, :default => "", :null => false
- t.string "prop_key", :limit => 30, :default => "", :null => false
- t.text "old_value"
- t.text "value"
- end
-
- add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
create_table "journal_replies", :id => false, :force => true do |t|
t.integer "journal_id"
t.integer "user_id"
@@ -977,6 +970,7 @@ ActiveRecord::Schema.define(:version => 20151208015409) do
t.integer "course_group_id", :default => 0
end
+ add_index "members", ["course_id"], :name => "index_members_on_course_id"
add_index "members", ["project_id"], :name => "index_members_on_project_id"
add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
add_index "members", ["user_id"], :name => "index_members_on_user_id"
@@ -1157,6 +1151,7 @@ ActiveRecord::Schema.define(:version => 20151208015409) do
t.datetime "updated_at", :null => false
t.boolean "locked", :default => false
t.integer "sticky", :default => 0
+ t.integer "org_subfield_id"
end
create_table "org_member_roles", :force => true do |t|
@@ -1183,6 +1178,7 @@ ActiveRecord::Schema.define(:version => 20151208015409) do
t.string "name"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
+ t.string "field_type"
end
create_table "organizations", :force => true do |t|
@@ -1533,7 +1529,6 @@ ActiveRecord::Schema.define(:version => 20151208015409) do
end
add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
- add_index "student_works", ["homework_common_id"], :name => "index"
create_table "student_works_evaluation_distributions", :force => true do |t|
t.integer "student_work_id"