Merge branch 'develop' into Branch_szzh

Conflicts:
	app/controllers/users_controller.rb
	app/models/course_activity.rb
	app/views/users/show.html.erb
	db/schema.rb

app/controllers/users_controller.rb

@@ -1018,6 +1018,8 @@ class UsersController < ApplicationController
           @user_activities = UserActivity.where("container_type = 'Principal' and act_type= 'JournalsForMessage' and container_id = #{@user.id}").order('updated_at desc').limit(10).offset(@page * 10)
         when "current_user"
           @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
+        when "current_user"
+          @user_activities = UserActivity.where("user_id = #{User.current.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
         else
           blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +

app/views/users/show.html.erb

@@ -1,49 +1,41 @@
-<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
-<div class="homepageRightBanner">
+  <div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>
     <ul class="resourcesSelect">
-  <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-    <ul class="homepagePostType">
-      <li>
-        <ul class="homepagePostTypeHomework fl">
-          <li class="f14">课程动态</li>
-          <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-            <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-          <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-          <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-          <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-          <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-            <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-        </ul>
-      </li>
-      <li>
-        <ul class="homepagePostTypeProject fl">
-          <li class="f14">项目动态</li>
-          <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-          <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-          <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-        </ul>
-      </li>
-      <li>
-        <ul class="homepagePostTypeProject fl">
-          <li class="f14">更多</li>
-          <li class="mt-4"><%= link_to "留言动态", {:controller => "users", :action => "show", :type => "user_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-          <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
-          <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+        <ul class="homepagePostType">
+          <li>
+            <ul class="homepagePostTypeHomework fl">
+              <li class="f14">课程动态</li>
+              <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+              <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+              <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+            </ul>
+          </li>
+          <li>
+            <ul class="homepagePostTypeProject fl">
+              <li class="f14">项目动态</li>
+              <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+              <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+            </ul>
+          </li>
+          <li>
+            <ul class="homepagePostTypeProject fl">
+              <li class="f14">更多</li>
+              <li class="mt-4"><%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%>
+              <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+            </ul>
+          </li>
         </ul>
       </li>
     </ul>
-  </li>
-</ul>
-</div>
-
-<!--显示个人主页-->
-<% if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %>
-    <% homepage = BlogComment.find(@user.blog.homepage_id) %>
-    <%= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
-<% end %>
+  </div>
 
 <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %>

db/migrate/20150906075625_add_user_id_to_user_activities.rb

@@ -0,0 +1,5 @@
+class AddUserIdToUserActivities < ActiveRecord::Migration
+  def change
+    add_column :user_activities, :user_id, :int
+  end
+end

db/migrate/20150906091045_update_user_activities.rb

@@ -0,0 +1,40 @@
+class UpdateUserActivities < ActiveRecord::Migration
+  def up
+    count = UserActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      UserActivity.page(i).per(30).each do |activity|
+        if activity.container_type.to_s == 'Project'
+          forge_activity = ForgeActivity.where("forge_act_type = '#{activity.act_type.to_s}' and forge_act_id = #{activity.act_id}").first
+          if forge_activity
+            activity.user_id = forge_activity.user_id
+          else
+            activity.user_id = 0
+          end
+
+        elsif activity.container_type.to_s == 'Course'
+          course_activity = CourseActivity.where("course_act_type = '#{activity.act_type.to_s}' and course_act_id = #{activity.act_id}").first
+          if course_activity
+            activity.user_id = course_activity.user_id
+          else
+            activity.user_id = 0
+          end
+        end
+        activity.save
+      end
+      end
+    end
+  end
+
+  def down
+    count = UserActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      UserActivity.page(i).per(30).each do |activity|
+        activity.user_id = nil
+        activity.save
+      end
+      end
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160122143138) do
+ActiveRecord::Schema.define(:version => 20150906091045) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -66,41 +66,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.datetime "updated_at", :null => false
   end
 
-  create_table "at_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "at_message_id"
-    t.string   "at_message_type"
-    t.boolean  "viewed",          :default => false
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.integer  "sender_id"
-  end
-
-  add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id"
-
-  create_table "attachment_histories", :force => true do |t|
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.string   "filename",                     :default => ""
-    t.string   "disk_filename",                :default => ""
-    t.integer  "filesize",                     :default => 0
-    t.string   "content_type",                 :default => ""
-    t.string   "digest",         :limit => 40, :default => ""
-    t.integer  "downloads",                    :default => 0
-    t.integer  "author_id"
-    t.datetime "created_on"
-    t.string   "description"
-    t.string   "disk_directory"
-    t.integer  "attachtype"
-    t.integer  "is_public"
-    t.integer  "copy_from"
-    t.integer  "quotes"
-    t.integer  "version"
-    t.integer  "attachment_id"
-  end
-
   create_table "attachments", :force => true do |t|
     t.integer  "container_id"
     t.string   "container_type", :limit => 30
@@ -179,37 +144,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer  "open_anonymous_evaluation", :default => 1
   end
 
-  create_table "blog_comments", :force => true do |t|
-    t.integer  "blog_id",                            :null => false
-    t.integer  "parent_id"
-    t.string   "title",           :default => "",    :null => false
-    t.text     "content"
-    t.integer  "author_id"
-    t.integer  "comments_count",  :default => 0,     :null => false
-    t.integer  "last_comment_id"
-    t.datetime "created_on",                         :null => false
-    t.datetime "updated_on",                         :null => false
-    t.boolean  "locked",          :default => false
-    t.integer  "sticky",          :default => 0
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.string   "name",             :default => "", :null => false
-    t.text     "description"
-    t.integer  "position",         :default => 1
-    t.integer  "article_count",    :default => 0,  :null => false
-    t.integer  "comments_count",   :default => 0,  :null => false
-    t.integer  "last_comments_id"
-    t.integer  "parent_id"
-    t.integer  "author_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "homepage_id"
-  end
-
   create_table "boards", :force => true do |t|
     t.integer "project_id",                      :null => false
     t.string  "name",            :default => "", :null => false
@@ -220,7 +154,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer "last_message_id"
     t.integer "parent_id"
     t.integer "course_id"
-    t.integer "org_subfield_id"
   end
 
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
@@ -419,20 +352,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer  "container_id",   :default => 0
   end
 
-  create_table "course_contributor_scores", :force => true do |t|
-    t.integer  "course_id"
-    t.integer  "user_id"
-    t.integer  "message_num"
-    t.integer  "message_reply_num"
-    t.integer  "news_reply_num"
-    t.integer  "resource_num"
-    t.integer  "journal_num"
-    t.integer  "journal_reply_num"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
-    t.integer  "total_score"
-  end
-
   create_table "course_groups", :force => true do |t|
     t.string   "name"
     t.integer  "course_id"
@@ -476,8 +395,8 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.string   "code"
     t.integer  "time"
     t.string   "extra"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
+    t.datetime "created_at",                                  :null => false
+    t.datetime "updated_at",                                  :null => false
     t.string   "location"
     t.string   "term"
     t.string   "string"
@@ -487,20 +406,13 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.string   "class_period"
     t.integer  "school_id"
     t.text     "description"
-    t.integer  "status",                        :default => 1
-    t.integer  "attachmenttype",                :default => 2
+    t.integer  "status",                       :default => 1
+    t.integer  "attachmenttype",               :default => 2
     t.integer  "lft"
     t.integer  "rgt"
-    t.integer  "is_public",        :limit => 1, :default => 1
-    t.integer  "inherit_members",  :limit => 1, :default => 1
-    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  "end_time"
-    t.string   "end_term"
-    t.integer  "is_excellent",                  :default => 0
-    t.integer  "excellent_option",              :default => 0
+    t.integer  "is_public",       :limit => 1, :default => 1
+    t.integer  "inherit_members", :limit => 1, :default => 1
+    t.integer  "open_student",                 :default => 0
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -564,13 +476,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -585,32 +490,23 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  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   "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
+  create_table "dts", :force => true do |t|
+    t.string   "IPLineCode"
     t.string   "Description"
-    t.text     "PreConditions", :limit => 2147483647
-    t.text     "TraceInfo",     :limit => 2147483647
-    t.text     "Code",          :limit => 2147483647
+    t.string   "Num"
+    t.string   "Variable"
+    t.string   "TraceInfo"
+    t.string   "Method"
+    t.string   "File"
+    t.string   "IPLine"
+    t.string   "Review"
+    t.string   "Category"
+    t.string   "Defect"
+    t.string   "PreConditions"
+    t.string   "StartLine"
     t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "id",                                  :null => false
-  end
-
-  create_table "editor_of_documents", :force => true do |t|
-    t.integer  "editor_id"
-    t.integer  "org_document_comment_id"
-    t.datetime "created_at"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
   end
 
   create_table "enabled_modules", :force => true do |t|
@@ -635,66 +531,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
-  create_table "exercise_answers", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_choices", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.text     "choice_text"
-    t.integer  "choice_position"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_questions", :force => true do |t|
-    t.text     "question_title"
-    t.integer  "question_type"
-    t.integer  "question_number"
-    t.integer  "exercise_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "question_score"
-  end
-
-  create_table "exercise_standard_answers", :force => true do |t|
-    t.integer  "exercise_question_id"
-    t.integer  "exercise_choice_id"
-    t.text     "answer_text"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-  end
-
-  create_table "exercise_users", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "exercise_id"
-    t.integer  "score"
-    t.datetime "start_at"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.datetime "end_at"
-    t.integer  "status"
-  end
-
-  create_table "exercises", :force => true do |t|
-    t.text     "exercise_name"
-    t.text     "exercise_description"
-    t.integer  "course_id"
-    t.integer  "exercise_status"
-    t.integer  "user_id"
-    t.integer  "time"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
-    t.datetime "publish_time"
-    t.datetime "end_time"
-    t.integer  "show_result"
-  end
-
   create_table "first_pages", :force => true do |t|
     t.string   "web_title"
     t.string   "title"
@@ -729,8 +565,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer  "viewed"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.string   "secret_key"
-    t.integer  "status"
   end
 
   create_table "forums", :force => true do |t|
@@ -775,28 +609,13 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.text     "description"
     t.date     "publish_time"
     t.date     "end_time"
-    t.integer  "homework_type",     :default => 1
+    t.integer  "homework_type", :default => 1
     t.string   "late_penalty"
     t.integer  "course_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.integer  "teacher_priority",  :default => 1
-    t.integer  "anonymous_comment", :default => 0
-  end
-
-  add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
-
-  create_table "homework_detail_groups", :force => true do |t|
-    t.integer  "homework_common_id"
-    t.integer  "min_num"
-    t.integer  "max_num"
-    t.integer  "base_on_project"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
   end
 
-  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
-
   create_table "homework_detail_manuals", :force => true do |t|
     t.float    "ta_proportion"
     t.integer  "comment_status"
@@ -856,7 +675,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer  "user_id"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-    t.string   "mail"
   end
 
   create_table "issue_categories", :force => true do |t|
@@ -984,14 +802,13 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.text     "notes"
     t.integer  "status"
     t.integer  "reply_id"
-    t.datetime "created_on",                                 :null => false
-    t.datetime "updated_on",                                 :null => false
+    t.datetime "created_on",                  :null => false
+    t.datetime "updated_on",                  :null => false
     t.string   "m_parent_id"
     t.boolean  "is_readed"
     t.integer  "m_reply_count"
     t.integer  "m_reply_id"
     t.integer  "is_comprehensive_evaluation"
-    t.integer  "private",                     :default => 0
   end
 
   create_table "kindeditor_assets", :force => true do |t|
@@ -1072,9 +889,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.datetime "updated_on",                       :null => false
     t.boolean  "locked",        :default => false
     t.integer  "sticky",        :default => 0
-    t.integer  "reply_id"
-    t.integer  "quotes"
-    t.integer  "status",        :default => 0
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
@@ -1085,15 +899,14 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
 
   create_table "news", :force => true do |t|
     t.integer  "project_id"
-    t.string   "title",           :limit => 60, :default => "", :null => false
-    t.string   "summary",                       :default => ""
+    t.string   "title",          :limit => 60, :default => "", :null => false
+    t.string   "summary",                      :default => ""
     t.text     "description"
-    t.integer  "author_id",                     :default => 0,  :null => false
+    t.integer  "author_id",                    :default => 0,  :null => false
     t.datetime "created_on"
-    t.integer  "comments_count",                :default => 0,  :null => false
+    t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.integer  "sticky",                        :default => 0
-    t.integer  "org_subfield_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
@@ -1117,13 +930,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.datetime "updated_at",                 :null => false
   end
 
-  create_table "onclick_times", :force => true do |t|
-    t.integer  "user_id"
-    t.datetime "onclick_time"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
   create_table "open_id_authentication_associations", :force => true do |t|
     t.integer "issued"
     t.integer "lifetime"
@@ -1179,95 +985,11 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer  "project_id"
   end
 
-  create_table "org_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "org_act_id"
-    t.string   "org_act_type"
-    t.integer  "container_id"
-    t.string   "container_type"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
-  create_table "org_courses", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "course_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_document_comments", :force => true do |t|
-    t.text     "title"
-    t.text     "content"
-    t.integer  "organization_id"
-    t.integer  "creator_id"
-    t.integer  "parent_id"
-    t.integer  "reply_id"
-    t.datetime "created_at",                         :null => false
-    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|
-    t.integer "org_member_id"
-    t.integer "role_id"
-  end
-
-  create_table "org_members", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "organization_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "sender_id"
-    t.integer  "organization_id"
-    t.string   "message_type"
-    t.integer  "message_id"
-    t.integer  "viewed"
-    t.string   "content"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.integer  "status",          :default => 0
-  end
-
-  create_table "org_projects", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-  end
-
-  create_table "org_subfield_messages", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.integer  "message_id"
-    t.string   "message_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "org_subfields", :force => true do |t|
-    t.integer  "organization_id"
-    t.integer  "priority"
-    t.string   "name"
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-    t.string   "field_type"
-    t.integer  "hide",            :default => 0
-  end
-
   create_table "organizations", :force => true do |t|
     t.string   "name"
-    t.text     "description"
-    t.integer  "creator_id"
-    t.integer  "home_id"
-    t.string   "domain"
-    t.boolean  "is_public"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
-    t.boolean  "allow_guest_download", :default => true
+    t.string   "logo_link"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "phone_app_versions", :force => true do |t|
@@ -1343,15 +1065,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.datetime "updated_at",               :null => false
   end
 
-  create_table "principal_activities", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "principal_id"
-    t.integer  "principal_act_id"
-    t.string   "principal_act_type"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1370,9 +1083,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer  "documents_num",     :default => 0
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
-    t.integer  "board_num",         :default => 0
-    t.integer  "attach_num",        :default => 0
-    t.datetime "commit_time"
   end
 
   create_table "project_statuses", :force => true do |t|
@@ -1395,38 +1105,26 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
   end
 
   create_table "projects", :force => true do |t|
-    t.string   "name",                   :default => "",    :null => false
+    t.string   "name",             :default => "",    :null => false
     t.text     "description"
-    t.string   "homepage",               :default => ""
-    t.boolean  "is_public",              :default => true,  :null => false
+    t.string   "homepage",         :default => ""
+    t.boolean  "is_public",        :default => true,  :null => false
     t.integer  "parent_id"
     t.datetime "created_on"
     t.datetime "updated_on"
     t.string   "identifier"
-    t.integer  "status",                 :default => 1,     :null => false
+    t.integer  "status",           :default => 1,     :null => false
     t.integer  "lft"
     t.integer  "rgt"
-    t.boolean  "inherit_members",        :default => false, :null => false
+    t.boolean  "inherit_members",  :default => false, :null => false
     t.integer  "project_type"
-    t.boolean  "hidden_repo",            :default => false, :null => false
-    t.integer  "attachmenttype",         :default => 1
+    t.boolean  "hidden_repo",      :default => false, :null => false
+    t.integer  "attachmenttype",   :default => 1
     t.integer  "user_id"
-    t.integer  "dts_test",               :default => 0
+    t.integer  "dts_test",         :default => 0
     t.string   "enterprise_name"
     t.integer  "organization_id"
     t.integer  "project_new_type"
-    t.integer  "gpid"
-    t.integer  "forked_from_project_id"
-    t.integer  "forked_count"
-    t.integer  "commits_count",          :default => 0
-    t.integer  "publish_resource",       :default => 0
-    t.integer  "issues_count",           :default => 0
-    t.integer  "attachments_count",      :default => 0
-    t.integer  "boards_count",           :default => 0
-    t.integer  "news_count",             :default => 0
-    t.integer  "acts_count",             :default => 0
-    t.integer  "journals_count",         :default => 0
-    t.integer  "boards_reply_count",     :default => 0
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -1529,7 +1227,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
     t.string   "logo_link"
-    t.string   "pinyin"
   end
 
   create_table "seems_rateable_cached_ratings", :force => true do |t|
@@ -1573,15 +1270,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.string   "description"
   end
 
-  create_table "shield_activities", :force => true do |t|
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.string   "shield_type"
-    t.integer  "shield_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1600,21 +1288,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.integer  "project_id"
   end
 
-  create_table "student_work_projects", :force => true do |t|
-    t.integer  "homework_common_id"
-    t.integer  "student_work_id"
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.integer  "is_leader"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
-  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
-  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
-  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
-  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
-
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
     t.datetime "created_at",                     :null => false
@@ -1634,16 +1307,13 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.float    "student_score"
     t.float    "teaching_asistant_score"
     t.integer  "project_id",                                    :default => 0
-    t.datetime "created_at",                                                       :null => false
-    t.datetime "updated_at",                                                       :null => false
+    t.datetime "created_at",                                                   :null => false
+    t.datetime "updated_at",                                                   :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
-    t.boolean  "is_test",                                       :default => false
+    t.integer  "system_score"
   end
 
-  add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
-
   create_table "student_works_evaluation_distributions", :force => true do |t|
     t.integer  "student_work_id"
     t.integer  "user_id"
@@ -1671,22 +1341,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
   add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
   add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
 
-  create_table "subfield_subdomain_dirs", :force => true do |t|
-    t.integer  "org_subfield_id"
-    t.string   "name"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "system_messages", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "content"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.text     "description"
-    t.string   "subject"
-  end
-
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
@@ -1876,7 +1530,6 @@ ActiveRecord::Schema.define(:version => 20160122143138) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
-    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"