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

Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

This commit is contained in:
ouyangxuhua 2015-11-13 08:45:41 +08:00
parent 6ec27761fb b3a234cfc6
commit eb64fa7642
10 changed files with 50 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -52,7 +52,7 @@ module ApplicationHelper
def get_org_member_role_name member
case member.roles[0].name
when 'orgManager'
'组织管理员'
'管理人员'
when 'orgMember'
'组织成员'
end

2
app/helpers/org_member_helper.rb
View File

@ -11,6 +11,6 @@ module OrgMemberHelper
links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true
}
s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" )
s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
end
end

2
app/helpers/organizations_helper.rb
View File

@ -14,7 +14,7 @@ module OrganizationsHelper
links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true
}
s + content_tag('ul', links,:class => 'wlist', :id => "org_member_pagination_links" )
s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
end
end

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

@ -25,7 +25,7 @@
<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
<div class="resources">
<div>
<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="请输入文章标题" />
<input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题" />
</div>
<div id="doc_title_hint"></div>
<div class="cl"></div>

2
app/views/org_document_comments/edit.html.erb
View File

@ -18,7 +18,7 @@
<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id),:method => 'put', :id => 'new_org_document_form' do |f| %>
<div class="resources">
<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 %>" />
<input class="postDetailInput fl mr15" style="margin-bottom:15px;" maxlength="250" 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 id="org_document_editor" class="mt15" style="">

2
app/views/org_member/org_member_autocomplete.js.erb
View File

@ -1,5 +1,5 @@
<% if @org%>
var checked = $("#not_org_members input:checked").size();
var checked = $("#principals_for_new_member input:checked").size();
if(checked > 0)
{
alert('翻页或搜索后将丢失当前选择的用户数据!');

13
app/views/organizations/_org_member_list.html.erb
View File

@ -1,7 +1,7 @@
<% members.each do |member|%>
<ul class="orgListRow">
<li class="orgListUser"><a href="<%= user_path(User.find(member.user_id))%>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %></a></li>
<li class="orgListUser">
<li class="orgListRole">
<%= get_org_member_role_name member %>
<%= form_for(member, {:as => :org_member, :remote => true, :url => org_member_path(member),
:method => :put,
@ -13,7 +13,7 @@
<!--编辑时候显示成员，中英文切换后面需从数据库的角度优化-->
<% if User.current.language == "zh" %>
<% if role.id == 11 %>
<label >组织管理员</label>
<label >管理人员</label>
<% elsif role.id == 12 %>
<label >组织成员</label>
<% end %>
@ -25,20 +25,19 @@
<% end %>
<%= hidden_field_tag 'membership[role_ids][]', '' %>
<div class="pt5">
<a href="javascript:void(0)" class="project_member_btn" onclick="$('#org-member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
<a href="javascript:void(0)" class="org_member_btn" onclick="$('#org-member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
<%= l(:button_change)%>
</a>
<a href="javascript:void(0)" class="project_member_btn" onclick="$('#org-member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(18)">
<a href="javascript:void(0)" class="org_member_btn" onclick="$('#org-member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(18)">
<%= l(:button_cancel)%>
</a>
</div>
<% end %>
</li>
<li>
<!-- -->
<% if ( (User.current.id == member.organization.creator_id || member.roles[0].name == "orgManager" ) && member.user_id != member.organization.creator_id )%>
<a href="javascript:void(0);" onclick="$(this).parent().parent().height(70);$('#org-member-<%= member.id%>-roles-form').show();">编辑</a> | <%= link_to '删除', org_member_path(member.id),:method=>'delete', :remote => true %><% end %>
</li>
<a href="javascript:void(0);" style="color: #0781B4;margin-left: 30px;float: left" onclick="$(this).parent().height(70);$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
<%= link_to '删除', org_member_path(member.id),:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
<div class="cl"></div>
</ul>
<% end %>

1
app/views/organizations/setting.html.erb
View File

@ -74,7 +74,6 @@
<ul class="orgListRow">
<li class="orgListUser fb">用户</li>
<li class="orgListRole fb">角色</li>
<li></li>
<div class="cl"></div>
</ul>
<div id="org_member_list">

345
db/schema.rb
View File

@ -293,16 +293,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.boolean "diff_all"
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|
t.string "commented_type", :limit => 30, :default => "", :null => false
t.integer "commented_id", :default => 0, :null => false
@ -501,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", ["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|
t.integer "priority", :default => 0, :null => false
t.integer "attempts", :default => 0, :null => false
@ -565,26 +528,23 @@ ActiveRecord::Schema.define(:version => 20151110011003) 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
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "enabled_modules", :force => true do |t|
@ -609,31 +569,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) 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 "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|
t.string "web_title"
t.string "title"
@ -685,21 +620,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "locked"
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|
t.integer "group_id", :null => false
t.integer "user_id", :null => false
@ -707,35 +627,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
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|
t.integer "bid_id"
t.integer "user_id"
@ -764,6 +655,7 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
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
create_table "homework_detail_manuals", :force => true do |t|
@ -820,29 +712,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.datetime "updated_at", :null => false
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|
t.integer "project_id"
t.integer "user_id"
@ -945,6 +814,16 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
create_table "journal_details_copy", :force => true do |t|
t.integer "journal_id", :default => 0, :null => false
t.string "property", :limit => 30, :default => "", :null => false
t.string "prop_key", :limit => 30, :default => "", :null => false
t.text "old_value"
t.text "value"
end
add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
create_table "journal_replies", :id => false, :force => true do |t|
t.integer "journal_id"
t.integer "user_id"
@ -1072,15 +951,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) 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 "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|
t.integer "project_id"
t.string "title", :limit => 60, :default => "", :null => false
@ -1206,6 +1076,8 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
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_projects", :force => true do |t|
@ -1232,10 +1104,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.datetime "updated_at", :null => false
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|
t.integer "poll_question_id"
t.text "answer_text"
@ -1311,42 +1179,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.datetime "updated_at", :null => false
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|
t.integer "project_id"
t.integer "user_id"
@ -1421,18 +1253,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"], :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|
t.integer "project_id"
t.string "name", :default => "", :null => false
@ -1546,17 +1366,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "is_teacher_score", :default => 0
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|
t.string "name", :default => "", :null => false
t.text "value"
@ -1577,20 +1386,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.string "description"
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|
t.string "name"
t.text "description"
@ -1672,19 +1467,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.string "subject"
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|
t.integer "tag_id"
t.integer "taggable_id"
@ -1734,32 +1516,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
add_index "time_entries", ["project_id"], :name => "time_entries_project_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|
t.integer "user_id", :default => 0, :null => false
t.string "action", :limit => 30, :default => "", :null => false
@ -1778,51 +1534,6 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
t.integer "fields_bits", :default => 0
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|
t.string "act_type"
t.integer "act_id"

6
public/stylesheets/org.css
View File

@ -20,8 +20,8 @@ a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;}
a.saveBtn:hover {background-color:#297fb8;}
.orgMemberList {width:410px; float:left;}
.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;}
.orgListUser {width:125px; float:left;}
.orgListRole {width:285px; float:left;}
.orgListUser {width:119px; float:left;}
.orgListRole {width:180px; float:left;}
.orgMemContainer {width:278px;}
.orgMemberAdd {float:right; width:240px;}
.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
@ -32,6 +32,8 @@ a.saveBtn:hover {background-color:#297fb8;}
padding: 2px 5px;
border: 1px solid #EAEAEA;}
a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
/*项目关联css*/
.relateOrg {width:335px;}
.relatedList {width:335px;}