jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

组织页面调整

This commit is contained in:
Tim 2015-11-12 17:00:35 +08:00
parent 1a1dc7bacc
commit 7751dc9081
4 changed files with 246 additions and 555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/base_org.html.erb
View File

@ -23,7 +23,7 @@
</head> </head>
<!--add by huang--> <!--add by huang-->
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer mb10"> <div class="navContainer">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>
<% else %> <% else %>
@ -51,7 +51,7 @@
<% end%> <% end%>
</div> </div>
<div class="orgName fl mb5 f14">组织id：<%= @organization.id %></div> <div class="orgName fl mb5 f14">组织id：<%= @organization.id %></div>
<a href="<%= setting_organization_path(@organization) %>" class="pr_join_a"><span class="pr_setting"></span>配置</a> <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
<div class="cl"></div> <div class="cl"></div>
<div class="f12 fontGrey3"> <div class="f12 fontGrey3">

7
app/views/org_document_comments/_new.html.erb
View File

@ -15,11 +15,12 @@
<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
<div class="resources"> <div class="resources">
<div> <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();" placeholder="请输入文章标题"></input> <input class="postDetailInput fl" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题" />
</div> </div>
<div id="doc_title_hint"></div> <div id="doc_title_hint"></div>
<div id="org_document_editor" class="mt15" style="display: none"> <div class="cl"></div>
<div class="mt10"> <div id="org_document_editor" class="mt10" style="display: none">
<div>
<%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %> <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>

6
app/views/organizations/_show_org_document.html.erb
View File

@ -6,7 +6,7 @@
<div class="homepagePostDes"> <div class="homepagePostDes">
<div class="homepagePostTo"> <div class="homepagePostTo">
<%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization) %> | 组织 TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | 组织
</div> </div>
<div class="homepagePostTitle postGrey"><%= document.title %></div> <div class="homepagePostTitle postGrey"><%= document.title %></div>
<div class="homepagePostDate"> <div class="homepagePostDate">
@ -38,7 +38,7 @@
</div> </div>
<% comments_for_doc = document.children.reorder("created_at desc") %> <% comments_for_doc = document.children.reorder("created_at desc") %>
<% count = document.children.count() %> <% count = document.children.count() %>
<div class="homepagePostReply" style="background-color: #f1f1f1;" id="<%= document.id %>"> <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
<div class="homepagePostReplyBanner" style="display:<%= count == 0?'none':'block' %>"> <div class="homepagePostReplyBanner" style="display:<%= count == 0?'none':'block' %>">
<div class="homepagePostReplyBannerCount">回复（<%= count %>）</div> <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
<% if count > 3 %> <% if count > 3 %>
@ -70,7 +70,7 @@
<% end %> <% end %>
</ul> </ul>
</div> </div>
<div class="homepagePostReplyContainer"> <div class="homepagePostReplyContainer borderBottomNone minHeight48">
<div class="homepagePostReplyPortrait mr15"> <div class="homepagePostReplyPortrait mr15">
<%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %> <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
</div> </div>

310
db/schema.rb
View File

@ -11,11 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(:version => 20151102090519) do
=======
ActiveRecord::Schema.define(:version => 20151110011003) do ActiveRecord::Schema.define(:version => 20151110011003) do
>>>>>>> bf01994e4f47b468072cfd7affa885eb6476d577
create_table "activities", :force => true do |t| create_table "activities", :force => true do |t|
t.integer "act_id", :null => false t.integer "act_id", :null => false
@ -297,16 +293,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.boolean "diff_all" t.boolean "diff_all"
end end
create_table "columns_priv", :id => false, :force => true do |t|
t.string "Host", :limit => 60, :default => "", :null => false
t.string "Db", :limit => 64, :default => "", :null => false
t.string "User", :limit => 16, :default => "", :null => false
t.string "Table_name", :limit => 64, :default => "", :null => false
t.string "Column_name", :limit => 64, :default => "", :null => false
t.timestamp "Timestamp", :null => false
t.string "Column_priv", :limit => 0, :default => "", :null => false
end
create_table "comments", :force => true do |t| create_table "comments", :force => true do |t|
t.string "commented_type", :limit => 30, :default => "", :null => false t.string "commented_type", :limit => 30, :default => "", :null => false
t.integer "commented_id", :default => 0, :null => false t.integer "commented_id", :default => 0, :null => false
@ -505,33 +491,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id"
add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized"
create_table "db", :id => false, :force => true do |t|
t.string "Host", :limit => 60, :default => "", :null => false
t.string "Db", :limit => 64, :default => "", :null => false
t.string "User", :limit => 16, :default => "", :null => false
t.string "Select_priv", :limit => 1, :default => "N", :null => false
t.string "Insert_priv", :limit => 1, :default => "N", :null => false
t.string "Update_priv", :limit => 1, :default => "N", :null => false
t.string "Delete_priv", :limit => 1, :default => "N", :null => false
t.string "Create_priv", :limit => 1, :default => "N", :null => false
t.string "Drop_priv", :limit => 1, :default => "N", :null => false
t.string "Grant_priv", :limit => 1, :default => "N", :null => false
t.string "References_priv", :limit => 1, :default => "N", :null => false
t.string "Index_priv", :limit => 1, :default => "N", :null => false
t.string "Alter_priv", :limit => 1, :default => "N", :null => false
t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false
t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false
t.string "Create_view_priv", :limit => 1, :default => "N", :null => false
t.string "Show_view_priv", :limit => 1, :default => "N", :null => false
t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false
t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false
t.string "Execute_priv", :limit => 1, :default => "N", :null => false
t.string "Event_priv", :limit => 1, :default => "N", :null => false
t.string "Trigger_priv", :limit => 1, :default => "N", :null => false
end
add_index "db", ["User"], :name => "User"
create_table "delayed_jobs", :force => true do |t| create_table "delayed_jobs", :force => true do |t|
t.integer "priority", :default => 0, :null => false t.integer "priority", :default => 0, :null => false
t.integer "attempts", :default => 0, :null => false t.integer "attempts", :default => 0, :null => false
@ -613,31 +572,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
create_table "event", :id => false, :force => true do |t|
t.string "db", :limit => 64, :default => "", :null => false
t.string "name", :limit => 64, :default => "", :null => false
t.binary "body", :limit => 2147483647, :null => false
t.string "definer", :limit => 77, :default => "", :null => false
t.datetime "execute_at"
t.integer "interval_value"
t.string "interval_field", :limit => 18
t.timestamp "created", :null => false
t.timestamp "modified", :null => false
t.datetime "last_executed"
t.datetime "starts"
t.datetime "ends"
t.string "status", :limit => 18, :default => "ENABLED", :null => false
t.string "on_completion", :limit => 8, :default => "DROP", :null => false
t.string "sql_mode", :limit => 0, :default => "", :null => false
t.string "comment", :limit => 64, :default => "", :null => false
t.integer "originator", :null => false
t.string "time_zone", :limit => 64, :default => "SYSTEM", :null => false
t.string "character_set_client", :limit => 32
t.string "collation_connection", :limit => 32
t.string "db_collation", :limit => 32
t.binary "body_utf8", :limit => 2147483647
end
create_table "first_pages", :force => true do |t| create_table "first_pages", :force => true do |t|
t.string "web_title" t.string "web_title"
t.string "title" t.string "title"
@ -689,21 +623,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "locked" t.integer "locked"
end end
create_table "func", :primary_key => "name", :force => true do |t|
t.boolean "ret", :default => false, :null => false
t.string "dl", :limit => 128, :default => "", :null => false
t.string "type", :limit => 9, :null => false
end
create_table "general_log", :id => false, :force => true do |t|
t.timestamp "event_time", :null => false
t.text "user_host", :limit => 16777215, :null => false
t.integer "thread_id", :null => false
t.integer "server_id", :null => false
t.string "command_type", :limit => 64, :null => false
t.text "argument", :limit => 16777215, :null => false
end
create_table "groups_users", :id => false, :force => true do |t| create_table "groups_users", :id => false, :force => true do |t|
t.integer "group_id", :null => false t.integer "group_id", :null => false
t.integer "user_id", :null => false t.integer "user_id", :null => false
@ -711,35 +630,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true add_index "groups_users", ["group_id", "user_id"], :name => "groups_users_ids", :unique => true
create_table "help_category", :primary_key => "help_category_id", :force => true do |t|
t.string "name", :limit => 64, :null => false
t.integer "parent_category_id", :limit => 2
t.text "url", :null => false
end
add_index "help_category", ["name"], :name => "name", :unique => true
create_table "help_keyword", :primary_key => "help_keyword_id", :force => true do |t|
t.string "name", :limit => 64, :null => false
end
add_index "help_keyword", ["name"], :name => "name", :unique => true
create_table "help_relation", :id => false, :force => true do |t|
t.integer "help_topic_id", :null => false
t.integer "help_keyword_id", :null => false
end
create_table "help_topic", :primary_key => "help_topic_id", :force => true do |t|
t.string "name", :limit => 64, :null => false
t.integer "help_category_id", :limit => 2, :null => false
t.text "description", :null => false
t.text "example", :null => false
t.text "url", :null => false
end
add_index "help_topic", ["name"], :name => "name", :unique => true
create_table "homework_attaches", :force => true do |t| create_table "homework_attaches", :force => true do |t|
t.integer "bid_id" t.integer "bid_id"
t.integer "user_id" t.integer "user_id"
@ -825,29 +715,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
end end
create_table "host", :id => false, :force => true do |t|
t.string "Host", :limit => 60, :default => "", :null => false
t.string "Db", :limit => 64, :default => "", :null => false
t.string "Select_priv", :limit => 1, :default => "N", :null => false
t.string "Insert_priv", :limit => 1, :default => "N", :null => false
t.string "Update_priv", :limit => 1, :default => "N", :null => false
t.string "Delete_priv", :limit => 1, :default => "N", :null => false
t.string "Create_priv", :limit => 1, :default => "N", :null => false
t.string "Drop_priv", :limit => 1, :default => "N", :null => false
t.string "Grant_priv", :limit => 1, :default => "N", :null => false
t.string "References_priv", :limit => 1, :default => "N", :null => false
t.string "Index_priv", :limit => 1, :default => "N", :null => false
t.string "Alter_priv", :limit => 1, :default => "N", :null => false
t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false
t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false
t.string "Create_view_priv", :limit => 1, :default => "N", :null => false
t.string "Show_view_priv", :limit => 1, :default => "N", :null => false
t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false
t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false
t.string "Execute_priv", :limit => 1, :default => "N", :null => false
t.string "Trigger_priv", :limit => 1, :default => "N", :null => false
end
create_table "invite_lists", :force => true do |t| create_table "invite_lists", :force => true do |t|
t.integer "project_id" t.integer "project_id"
t.integer "user_id" t.integer "user_id"
@ -1077,15 +944,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
add_index "messages", ["parent_id"], :name => "messages_parent_id" add_index "messages", ["parent_id"], :name => "messages_parent_id"
create_table "ndb_binlog_index", :primary_key => "epoch", :force => true do |t|
t.integer "Position", :limit => 8, :null => false
t.string "File", :null => false
t.integer "inserts", :limit => 8, :null => false
t.integer "updates", :limit => 8, :null => false
t.integer "deletes", :limit => 8, :null => false
t.integer "schemaops", :limit => 8, :null => false
end
create_table "news", :force => true do |t| create_table "news", :force => true do |t|
t.integer "project_id" t.integer "project_id"
t.string "title", :limit => 60, :default => "", :null => false t.string "title", :limit => 60, :default => "", :null => false
@ -1180,12 +1038,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "project_id" t.integer "project_id"
end end
<<<<<<< HEAD
create_table "org_members", :force => true do |t|
t.integer "user_id"
t.integer "organization_id"
t.string "role"
=======
create_table "org_activities", :force => true do |t| create_table "org_activities", :force => true do |t|
t.integer "user_id" t.integer "user_id"
t.integer "org_act_id" t.integer "org_act_id"
@ -1223,7 +1075,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "organization_id" t.integer "organization_id"
t.integer "project_id" t.integer "project_id"
t.datetime "created_at" t.datetime "created_at"
>>>>>>> bf01994e4f47b468072cfd7affa885eb6476d577
end end
create_table "organizations", :force => true do |t| create_table "organizations", :force => true do |t|
@ -1244,10 +1095,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
end end
create_table "plugin", :primary_key => "name", :force => true do |t|
t.string "dl", :limit => 128, :default => "", :null => false
end
create_table "poll_answers", :force => true do |t| create_table "poll_answers", :force => true do |t|
t.integer "poll_question_id" t.integer "poll_question_id"
t.text "answer_text" t.text "answer_text"
@ -1323,42 +1170,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
end end
create_table "proc", :id => false, :force => true do |t|
t.string "db", :limit => 64, :default => "", :null => false
t.string "name", :limit => 64, :default => "", :null => false
t.string "type", :limit => 9, :null => false
t.string "specific_name", :limit => 64, :default => "", :null => false
t.string "language", :limit => 3, :default => "SQL", :null => false
t.string "sql_data_access", :limit => 17, :default => "CONTAINS_SQL", :null => false
t.string "is_deterministic", :limit => 3, :default => "NO", :null => false
t.string "security_type", :limit => 7, :default => "DEFINER", :null => false
t.binary "param_list", :null => false
t.binary "returns", :limit => 2147483647, :null => false
t.binary "body", :limit => 2147483647, :null => false
t.string "definer", :limit => 77, :default => "", :null => false
t.timestamp "created", :null => false
t.timestamp "modified", :null => false
t.string "sql_mode", :limit => 0, :default => "", :null => false
t.text "comment", :null => false
t.string "character_set_client", :limit => 32
t.string "collation_connection", :limit => 32
t.string "db_collation", :limit => 32
t.binary "body_utf8", :limit => 2147483647
end
create_table "procs_priv", :id => false, :force => true do |t|
t.string "Host", :limit => 60, :default => "", :null => false
t.string "Db", :limit => 64, :default => "", :null => false
t.string "User", :limit => 16, :default => "", :null => false
t.string "Routine_name", :limit => 64, :default => "", :null => false
t.string "Routine_type", :limit => 9, :null => false
t.string "Grantor", :limit => 77, :default => "", :null => false
t.string "Proc_priv", :limit => 0, :default => "", :null => false
t.timestamp "Timestamp", :null => false
end
add_index "procs_priv", ["Grantor"], :name => "Grantor"
create_table "project_infos", :force => true do |t| create_table "project_infos", :force => true do |t|
t.integer "project_id" t.integer "project_id"
t.integer "user_id" t.integer "user_id"
@ -1433,18 +1244,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true 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" add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
create_table "proxies_priv", :id => false, :force => true do |t|
t.string "Host", :limit => 60, :default => "", :null => false
t.string "User", :limit => 16, :default => "", :null => false
t.string "Proxied_host", :limit => 60, :default => "", :null => false
t.string "Proxied_user", :limit => 16, :default => "", :null => false
t.boolean "With_grant", :default => false, :null => false
t.string "Grantor", :limit => 77, :default => "", :null => false
t.timestamp "Timestamp", :null => false
end
add_index "proxies_priv", ["Grantor"], :name => "Grantor"
create_table "queries", :force => true do |t| create_table "queries", :force => true do |t|
t.integer "project_id" t.integer "project_id"
t.string "name", :default => "", :null => false t.string "name", :default => "", :null => false
@ -1558,17 +1357,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "is_teacher_score", :default => 0 t.integer "is_teacher_score", :default => 0
end end
create_table "servers", :primary_key => "Server_name", :force => true do |t|
t.string "Host", :limit => 64, :default => "", :null => false
t.string "Db", :limit => 64, :default => "", :null => false
t.string "Username", :limit => 64, :default => "", :null => false
t.string "Password", :limit => 64, :default => "", :null => false
t.integer "Port", :default => 0, :null => false
t.string "Socket", :limit => 64, :default => "", :null => false
t.string "Wrapper", :limit => 64, :default => "", :null => false
t.string "Owner", :limit => 64, :default => "", :null => false
end
create_table "settings", :force => true do |t| create_table "settings", :force => true do |t|
t.string "name", :default => "", :null => false t.string "name", :default => "", :null => false
t.text "value" t.text "value"
@ -1589,20 +1377,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.string "description" t.string "description"
end end
create_table "slow_log", :id => false, :force => true do |t|
t.timestamp "start_time", :null => false
t.text "user_host", :limit => 16777215, :null => false
t.time "query_time", :null => false
t.time "lock_time", :null => false
t.integer "rows_sent", :null => false
t.integer "rows_examined", :null => false
t.string "db", :limit => 512, :null => false
t.integer "last_insert_id", :null => false
t.integer "insert_id", :null => false
t.integer "server_id", :null => false
t.text "sql_text", :limit => 16777215, :null => false
end
create_table "softapplications", :force => true do |t| create_table "softapplications", :force => true do |t|
t.string "name" t.string "name"
t.text "description" t.text "description"
@ -1684,19 +1458,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.string "subject" t.string "subject"
end end
create_table "tables_priv", :id => false, :force => true do |t|
t.string "Host", :limit => 60, :default => "", :null => false
t.string "Db", :limit => 64, :default => "", :null => false
t.string "User", :limit => 16, :default => "", :null => false
t.string "Table_name", :limit => 64, :default => "", :null => false
t.string "Grantor", :limit => 77, :default => "", :null => false
t.timestamp "Timestamp", :null => false
t.string "Table_priv", :limit => 0, :default => "", :null => false
t.string "Column_priv", :limit => 0, :default => "", :null => false
end
add_index "tables_priv", ["Grantor"], :name => "Grantor"
create_table "taggings", :force => true do |t| create_table "taggings", :force => true do |t|
t.integer "tag_id" t.integer "tag_id"
t.integer "taggable_id" t.integer "taggable_id"
@ -1746,32 +1507,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "time_entries", ["project_id"], :name => "time_entries_project_id" add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id" add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
create_table "time_zone", :primary_key => "Time_zone_id", :force => true do |t|
t.string "Use_leap_seconds", :limit => 1, :default => "N", :null => false
end
create_table "time_zone_leap_second", :primary_key => "Transition_time", :force => true do |t|
t.integer "Correction", :null => false
end
create_table "time_zone_name", :primary_key => "Name", :force => true do |t|
t.integer "Time_zone_id", :null => false
end
create_table "time_zone_transition", :id => false, :force => true do |t|
t.integer "Time_zone_id", :null => false
t.integer "Transition_time", :limit => 8, :null => false
t.integer "Transition_type_id", :null => false
end
create_table "time_zone_transition_type", :id => false, :force => true do |t|
t.integer "Time_zone_id", :null => false
t.integer "Transition_type_id", :null => false
t.integer "Offset", :default => 0, :null => false
t.integer "Is_DST", :limit => 1, :default => 0, :null => false
t.string "Abbreviation", :limit => 8, :default => "", :null => false
end
create_table "tokens", :force => true do |t| create_table "tokens", :force => true do |t|
t.integer "user_id", :default => 0, :null => false t.integer "user_id", :default => 0, :null => false
t.string "action", :limit => 30, :default => "", :null => false t.string "action", :limit => 30, :default => "", :null => false
@ -1790,51 +1525,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "fields_bits", :default => 0 t.integer "fields_bits", :default => 0
end end
create_table "user", :id => false, :force => true do |t|
t.string "Host", :limit => 60, :default => "", :null => false
t.string "User", :limit => 16, :default => "", :null => false
t.string "Password", :limit => 41, :default => "", :null => false
t.string "Select_priv", :limit => 1, :default => "N", :null => false
t.string "Insert_priv", :limit => 1, :default => "N", :null => false
t.string "Update_priv", :limit => 1, :default => "N", :null => false
t.string "Delete_priv", :limit => 1, :default => "N", :null => false
t.string "Create_priv", :limit => 1, :default => "N", :null => false
t.string "Drop_priv", :limit => 1, :default => "N", :null => false
t.string "Reload_priv", :limit => 1, :default => "N", :null => false
t.string "Shutdown_priv", :limit => 1, :default => "N", :null => false
t.string "Process_priv", :limit => 1, :default => "N", :null => false
t.string "File_priv", :limit => 1, :default => "N", :null => false
t.string "Grant_priv", :limit => 1, :default => "N", :null => false
t.string "References_priv", :limit => 1, :default => "N", :null => false
t.string "Index_priv", :limit => 1, :default => "N", :null => false
t.string "Alter_priv", :limit => 1, :default => "N", :null => false
t.string "Show_db_priv", :limit => 1, :default => "N", :null => false
t.string "Super_priv", :limit => 1, :default => "N", :null => false
t.string "Create_tmp_table_priv", :limit => 1, :default => "N", :null => false
t.string "Lock_tables_priv", :limit => 1, :default => "N", :null => false
t.string "Execute_priv", :limit => 1, :default => "N", :null => false
t.string "Repl_slave_priv", :limit => 1, :default => "N", :null => false
t.string "Repl_client_priv", :limit => 1, :default => "N", :null => false
t.string "Create_view_priv", :limit => 1, :default => "N", :null => false
t.string "Show_view_priv", :limit => 1, :default => "N", :null => false
t.string "Create_routine_priv", :limit => 1, :default => "N", :null => false
t.string "Alter_routine_priv", :limit => 1, :default => "N", :null => false
t.string "Create_user_priv", :limit => 1, :default => "N", :null => false
t.string "Event_priv", :limit => 1, :default => "N", :null => false
t.string "Trigger_priv", :limit => 1, :default => "N", :null => false
t.string "Create_tablespace_priv", :limit => 1, :default => "N", :null => false
t.string "ssl_type", :limit => 9, :default => "", :null => false
t.binary "ssl_cipher", :null => false
t.binary "x509_issuer", :null => false
t.binary "x509_subject", :null => false
t.integer "max_questions", :default => 0, :null => false
t.integer "max_updates", :default => 0, :null => false
t.integer "max_connections", :default => 0, :null => false
t.integer "max_user_connections", :default => 0, :null => false
t.string "plugin", :limit => 64, :default => ""
t.text "authentication_string"
end
create_table "user_activities", :force => true do |t| create_table "user_activities", :force => true do |t|
t.string "act_type" t.string "act_type"
t.integer "act_id" t.integer "act_id"