组织新建帖子增减status状态

app/controllers/org_document_comments_controller.rb

@@ -12,6 +12,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id)
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
+    @org_document_comment.status = params[:org_document_comment][:status] == "on" ? 1 : 0
     @org_document_comment.save_attachments(params[:attachments])
     if params[:field_id]
       @org_document_comment.org_subfield_id = params[:field_id].to_i

app/models/org_document_comment.rb

@@ -1,5 +1,6 @@
 class OrgDocumentComment < ActiveRecord::Base
-  attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title,:sticky,:locked
+  # status: 1 模式二中置顶 0：模式二中正常显示
+  attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title, :sticky, :locked, :status
   include Redmine::SafeAttributes
   include ApplicationHelper
   belongs_to :organization

app/views/org_document_comments/_form.html.erb

@@ -0,0 +1,34 @@
+<div>
+  <input class="postDetailInput fl mr15"  name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></input>
+</div>
+<div id="doc_title_hint">
+</div>
+<div class="cl"></div>
+<div class="" >
+  <div class="mt10">
+    <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+    <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+  </div>
+  <div class="cl"></div>
+  <p id="homework_course_id_span" class="c_red mt5"></p>
+  <p id="e_tip" class="c_grey"></p>
+  <p id="e_tips" class="c_grey"></p>
+  <div class="cl"></div>
+  <div class="f14 fontGrey2">置顶显示&nbsp;:
+    <input type="checkbox" id="is_public"   name="org_document_comment[status]" class="ml3" />（仅限模式二）
+  </div>
+  <div class="cl"></div>
+  <div class="mt10">
+    <div class="fl" id="topic_attachments">
+      <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>
+    </div>
+  </div>
+  <div class="cl"></div>
+
+  <div class="mt5">
+    <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
+    <span class="fr mr10 mt3">或</span>
+    <a href="javascript:void(0);" onclick="cancel_create_org_document();" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/org_document_comments/edit.html.erb

@@ -28,36 +28,7 @@
 <div>
   <div class="resources" nhname="new_topic_form">
       <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
-    <div>
-        <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
-      </div>
-      <div id="doc_title_hint"></div>
-      <div class="cl"></div>
-      <div>
-        <div class="mt10">
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
-          <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
-        </div>
-        <div class="cl"></div>
 
-        <p id="homework_course_id_span" class="c_red mt5"></p>
-        <p id="e_tip" class="c_grey"></p>
-        <p id="e_tips" class="c_grey"></p>
-        <div class="cl"></div>
-
-        <div class="mt10">
-          <div class="fl" id="topic_attachments">
-            <%= render :partial => 'org_document_comments/attachment', :locals => {:container => @org_document} %>
-          </div>
-        </div>
-        <div class="cl"></div>
-        <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
-          <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" id="new_topic_cancel_btn" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
-          <div class="cl"></div>
-        </div>
-      </div>
     <% end %>
     </div>
 </div>

app/views/org_document_comments/new.html.erb

@@ -37,35 +37,6 @@
 </div>
 <div class="resources" nhname="new_topic_form" >
   <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
-    <div>
+     <%= render :partial => "form" %>
-        <input class="postDetailInput fl mr15"  name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></input>
-    </div>
-    <div id="doc_title_hint">
-    </div>
-    <div class="cl"></div>
-    <div class="" >
-      <div class="mt10">
-        <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
-        <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
-      </div>
-      <div class="cl"></div>
-      <p id="homework_course_id_span" class="c_red mt5"></p>
-      <p id="e_tip" class="c_grey"></p>
-      <p id="e_tips" class="c_grey"></p>
-      <div class="cl"></div>
-      <div class="mt10">
-        <div class="fl" id="topic_attachments">
-          <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %>
-        </div>
-      </div>
-      <div class="cl"></div>
-
-      <div class="mt5">
-            <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
-            <span class="fr mr10 mt3">或</span>
-            <a href="javascript:void(0);" onclick="cancel_create_org_document();" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
-        <div class="cl"></div>
-      </div>
-    </div>
   <% end %>
 </div>

app/views/organizations/show.html.erb

@@ -1,5 +1,5 @@
-<%# 区分两种模式 %>
+<%# 区分两种模式 params[:org_subfield_id] 不为空的时候则跳到栏目%>
-<% if @organization.switch_type %>
+<% if @organization.switch_type && params[:org_subfield_id].nil? %>
     <%= render :partial => 'show_type2' %>
 <% else %>
     <%= javascript_include_tag "jquery.infinitescroll.js" %>

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160519070718) do
+ActiveRecord::Schema.define(:version => 20160523085440) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,6 +52,28 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
+  create_table "application_settings", :force => true do |t|
+    t.integer  "default_projects_limit"
+    t.boolean  "signup_enabled"
+    t.boolean  "signin_enabled"
+    t.boolean  "gravatar_enabled"
+    t.text     "sign_in_text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "home_page_url"
+    t.integer  "default_branch_protection",    :default => 2
+    t.boolean  "twitter_sharing_enabled",      :default => true
+    t.text     "restricted_visibility_levels"
+    t.boolean  "version_check_enabled",        :default => true
+    t.integer  "max_attachment_size",          :default => 10,    :null => false
+    t.integer  "default_project_visibility"
+    t.integer  "default_snippet_visibility"
+    t.text     "restricted_signup_domains"
+    t.boolean  "user_oauth_applications",      :default => true
+    t.string   "after_sign_out_path"
+    t.integer  "session_expire_delay",         :default => 10080, :null => false
+  end
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -77,6 +99,18 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
   create_table "at_messages", :force => true do |t|
     t.integer  "user_id"
     t.integer  "at_message_id"
@@ -144,6 +178,20 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.string  "typeName", :limit => 50
   end
 
+  create_table "audit_events", :force => true do |t|
+    t.integer  "author_id",   :null => false
+    t.string   "type",        :null => false
+    t.integer  "entity_id",   :null => false
+    t.string   "entity_type", :null => false
+    t.text     "details"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
+  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
+  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -241,6 +289,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "broadcast_messages", :force => true do |t|
+    t.text     "message",    :null => false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.integer  "alert_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "color"
+    t.string   "font"
+  end
+
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -540,6 +599,10 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "visits",                        :default => 0
   end
 
+  add_index "courses", ["id"], :name => "id", :unique => true
+  add_index "courses", ["tea_id"], :name => "tea_id"
+  add_index "courses", ["visits"], :name => "visits"
+
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
@@ -601,6 +664,15 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "deploy_keys_projects", :force => true do |t|
+    t.integer  "deploy_key_id", :null => false
+    t.integer  "project_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -650,6 +722,16 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "created_at"
   end
 
+  create_table "emails", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "email",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
+  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -672,6 +754,25 @@ ActiveRecord::Schema.define(:version => 20160519070718) 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 "events", :force => true do |t|
+    t.string   "target_type"
+    t.integer  "target_id"
+    t.string   "title"
+    t.text     "data"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "action"
+    t.integer  "author_id"
+  end
+
+  add_index "events", ["action"], :name => "index_events_on_action"
+  add_index "events", ["author_id"], :name => "index_events_on_author_id"
+  add_index "events", ["created_at"], :name => "index_events_on_created_at"
+  add_index "events", ["project_id"], :name => "index_events_on_project_id"
+  add_index "events", ["target_id"], :name => "index_events_on_target_id"
+  add_index "events", ["target_type"], :name => "index_events_on_target_type"
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -774,6 +875,15 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
+  create_table "forked_project_links", :force => true do |t|
+    t.integer  "forked_to_project_id",   :null => false
+    t.integer  "forked_from_project_id", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -903,6 +1013,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "identities", :force => true do |t|
+    t.string   "extern_uid"
+    t.string   "provider"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
+  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1046,6 +1167,20 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "private",                     :default => 0
   end
 
+  create_table "keys", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "key"
+    t.string   "title"
+    t.string   "type"
+    t.string   "fingerprint"
+    t.boolean  "public",      :default => false, :null => false
+  end
+
+  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
+  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
+
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1057,6 +1192,27 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "owner_type", :default => 0
   end
 
+  create_table "label_links", :force => true do |t|
+    t.integer  "label_id"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
+  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "title"
+    t.string   "color"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1107,23 +1263,47 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "viewed_count",  :default => 0
   end
 
-  create_table "mess", :id => false, :force => true do |t|
+  create_table "merge_request_diffs", :force => true do |t|
-    t.string   "课程名"
+    t.string   "state"
-    t.integer  "课程ID",                    :default => 0,  :null => false
+    t.text     "st_commits",       :limit => 2147483647
-    t.string   "教师姓",                     :default => "", :null => false
+    t.text     "st_diffs",         :limit => 2147483647
-    t.string   "教师名",       :limit => 30, :default => "", :null => false
+    t.integer  "merge_request_id",                       :null => false
-    t.string   "主贴名",                     :default => "", :null => false
+    t.datetime "created_at"
-    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
+    t.datetime "updated_at"
-    t.integer  "回帖对应主贴ID"
-    t.integer  "帖子点赞数"
-    t.integer  "主贴回复数",                   :default => 0,  :null => false
-    t.text     "主贴或回帖内容"
-    t.datetime "发帖时间",                                    :null => false
-    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
-    t.string   "发帖或回帖用户姓",                :default => "", :null => false
-    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
   end
 
+  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
+
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "source_project_id",                :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "milestone_id"
+    t.string   "state"
+    t.string   "merge_status"
+    t.integer  "target_project_id",                :null => false
+    t.integer  "iid"
+    t.text     "description"
+    t.integer  "position",          :default => 0
+    t.datetime "locked_at"
+  end
+
+  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
+  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
+  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
+  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
+  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
+  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
+  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
+  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
+  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
+  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1158,6 +1338,39 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
+  create_table "milestones", :force => true do |t|
+    t.string   "title",       :null => false
+    t.integer  "project_id",  :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state"
+    t.integer  "iid"
+  end
+
+  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
+  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
+  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
+  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
+
+  create_table "namespaces", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
+    t.string   "description", :default => "", :null => false
+    t.string   "avatar"
+  end
+
+  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
+  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
+  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
+  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
+  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1183,6 +1396,31 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "notes", :force => true do |t|
+    t.text     "note"
+    t.string   "noteable_type"
+    t.integer  "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "project_id"
+    t.string   "attachment"
+    t.string   "line_code"
+    t.string   "commit_id"
+    t.integer  "noteable_id"
+    t.boolean  "system",                              :default => false, :null => false
+    t.text     "st_diff",       :limit => 2147483647
+  end
+
+  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
+  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
+  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
+  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
+  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
+  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
+  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
+  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
+  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
+
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1192,6 +1430,49 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "oauth_access_grants", :force => true do |t|
+    t.integer  "resource_owner_id", :null => false
+    t.integer  "application_id",    :null => false
+    t.string   "token",             :null => false
+    t.integer  "expires_in",        :null => false
+    t.text     "redirect_uri",      :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+
+  create_table "oauth_access_tokens", :force => true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             :null => false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        :null => false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
+  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
+  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+
+  create_table "oauth_applications", :force => true do |t|
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.text     "redirect_uri",                 :null => false
+    t.string   "scopes",       :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
+  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1282,6 +1563,7 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.boolean  "locked",          :default => false
     t.integer  "sticky",          :default => 0
     t.integer  "org_subfield_id"
+    t.integer  "status",          :default => 0
   end
 
   create_table "org_member_roles", :force => true do |t|
@@ -1348,6 +1630,23 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "permissions", :force => true do |t|
+    t.string  "controller",   :limit => 30, :default => "",    :null => false
+    t.string  "action",       :limit => 30, :default => "",    :null => false
+    t.string  "description",  :limit => 60, :default => "",    :null => false
+    t.boolean "is_public",                  :default => false, :null => false
+    t.integer "sort",                       :default => 0,     :null => false
+    t.boolean "mail_option",                :default => false, :null => false
+    t.boolean "mail_enabled",               :default => false, :null => false
+  end
+
+  create_table "permissions_roles", :id => false, :force => true do |t|
+    t.integer "permission_id", :default => 0, :null => false
+    t.integer "role_id",       :default => 0, :null => false
+  end
+
+  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1430,6 +1729,11 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "project_import_data", :force => true do |t|
+    t.integer "project_id"
+    t.text    "data"
+  end
+
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1519,6 +1823,16 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "protected_branches", :force => true do |t|
+    t.integer  "project_id",                             :null => false
+    t.string   "name",                                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "developers_can_push", :default => false, :null => false
+  end
+
+  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1653,6 +1967,25 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
+  create_table "services", :force => true do |t|
+    t.string   "type"
+    t.string   "title"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                :default => false, :null => false
+    t.text     "properties"
+    t.boolean  "template",              :default => false
+    t.boolean  "push_events",           :default => true
+    t.boolean  "issues_events",         :default => true
+    t.boolean  "merge_requests_events", :default => true
+    t.boolean  "tag_push_events",       :default => true
+    t.boolean  "note_events",           :default => true,  :null => false
+  end
+
+  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
+  add_index "services", ["project_id"], :name => "index_services_on_project_id"
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -1691,6 +2024,26 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "snippets", :force => true do |t|
+    t.string   "title"
+    t.text     "content",          :limit => 2147483647
+    t.integer  "author_id",                                             :null => false
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "file_name"
+    t.datetime "expires_at"
+    t.string   "type"
+    t.integer  "visibility_level",                       :default => 0, :null => false
+  end
+
+  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
+  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
+  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
+  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
+  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
+  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1763,9 +2116,9 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
+    t.float    "work_score"
     t.integer  "simi_id"
     t.integer  "simi_value"
-    t.float    "work_score"
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
@@ -1813,11 +2166,11 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
 
   create_table "sub_domains", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "priority",        :default => 0
+    t.integer  "priority"
     t.string   "name"
     t.string   "field_type"
-    t.integer  "hide",            :default => 0
+    t.integer  "hide"
-    t.integer  "status",          :default => 0
+    t.integer  "status"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end
@@ -1829,6 +2182,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subscriptions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "subscribable_id"
+    t.string   "subscribable_type"
+    t.boolean  "subscribed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
@@ -2068,6 +2432,17 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_star_projects", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.integer  "user_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
+  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
+  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2119,6 +2494,23 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type",                  :default => "ProjectHook"
+    t.integer  "service_id"
+    t.boolean  "push_events",           :default => true,          :null => false
+    t.boolean  "issues_events",         :default => false,         :null => false
+    t.boolean  "merge_requests_events", :default => false,         :null => false
+    t.boolean  "tag_push_events",       :default => false
+    t.boolean  "note_events",           :default => false,         :null => false
+  end
+
+  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
+  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"