From a9ef2c28e21417df02f785729d859f3883b3a04a Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Mar 2016 13:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_project_activities.html.erb | 1 - db/migrate/20160324052634_change_project_create_type.rb | 8 ++++++++ db/schema.rb | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20160324052634_change_project_create_type.rb diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index bc791d734..536921c13 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -78,7 +78,6 @@ <% when "Issue" %> <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %> - <% when "Message" %> <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id,:is_course=>1,:is_board=>0} %> diff --git a/db/migrate/20160324052634_change_project_create_type.rb b/db/migrate/20160324052634_change_project_create_type.rb new file mode 100644 index 000000000..8beca180d --- /dev/null +++ b/db/migrate/20160324052634_change_project_create_type.rb @@ -0,0 +1,8 @@ +class ChangeProjectCreateType < ActiveRecord::Migration + def up + execute("update forge_activities set forge_act_type = 'Project' where forge_act_type = 'ProjectCreateInfo'") + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 5eb9edd36..361752fa7 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 => 20160321080825) do +ActiveRecord::Schema.define(:version => 20160324052634) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -465,7 +465,6 @@ ActiveRecord::Schema.define(:version => 20160321080825) do t.integer "status" end - add_index "course_messages", ["course_message_id"], :name => "index_course_messages_on_course_message_id" add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type" add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at" @@ -1088,7 +1087,8 @@ ActiveRecord::Schema.define(:version => 20160321080825) do t.datetime "updated_at", :null => false end - add_index "message_alls", ["message_id", "message_type", "created_at"], :name => "index_message_alls_on_message_id_and_message_type_and_created_at" + add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type" + add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at" create_table "messages", :force => true do |t| t.integer "board_id", :null => false