From e3d78bf4f089114f76f6e77d5c373f104a5f37e5 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 20 Nov 2015 14:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/new.html.erb | 4 +- app/views/users/user_organizations.html.erb | 2 +- ...116070906_add_created_at_to_org_members.rb | 5 --- db/schema.rb | 44 ++++++++----------- public/stylesheets/new_user.css | 1 + public/stylesheets/org.css | 2 +- public/stylesheets/public.css | 1 + 7 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 db/migrate/20151116070906_add_created_at_to_org_members.rb diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 1ab3ad933..ab0a4ec50 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -34,8 +34,8 @@ （打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）
-
  • - 提交 +
  • + 创建 <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
    • diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb index 8c082b225..e9d78e695 100644 --- a/app/views/users/user_organizations.html.erb +++ b/app/views/users/user_organizations.html.erb @@ -2,7 +2,7 @@ <%#= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
    -
    +
    组织列表 diff --git a/db/migrate/20151116070906_add_created_at_to_org_members.rb b/db/migrate/20151116070906_add_created_at_to_org_members.rb deleted file mode 100644 index 33d3a2817..000000000 --- a/db/migrate/20151116070906_add_created_at_to_org_members.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCreatedAtToOrgMembers < ActiveRecord::Migration - def change - add_column :org_members, :created_at, :timestamp - end -end diff --git a/db/schema.rb b/db/schema.rb index ae220df3d..fc2bcee92 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -529,23 +529,26 @@ ActiveRecord::Schema.define(:version => 20151118031602) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :force => true do |t| - t.string "IPLineCode" - t.string "Description" - t.string "Num" - t.string "Variable" - t.string "TraceInfo" - t.string "Method" + 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 "IPLine" - t.string "Review" - t.string "Category" - t.string "Defect" - t.string "PreConditions" - t.string "StartLine" + 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 + t.string "Description" + t.text "PreConditions", :limit => 2147483647 + t.text "TraceInfo", :limit => 2147483647 + t.text "Code", :limit => 2147483647 t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" + t.integer "id", :null => false end create_table "enabled_modules", :force => true do |t| @@ -815,16 +818,6 @@ ActiveRecord::Schema.define(:version => 20151118031602) 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" @@ -1084,6 +1077,7 @@ ActiveRecord::Schema.define(:version => 20151118031602) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" + t.string "role" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 6ccfc47f6..d18dd27d8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -84,6 +84,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .ml90{ margin-left:90px;} .ml100{ margin-left:100px;} .ml110{ margin-left:110px;} +.ml125 { margin-left:125px;} .ml150 { margin-left:150px;} .mr-5 {margin-right:-5px;} .mr5{ margin-right:5px;} diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index c8116003e..914df16b5 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -2,7 +2,7 @@ /* CSS Document */ .orgName {width:130px; color:#484848;} -.organization_r_h02{ width:970px; height:40px; background:#eaeaea; margin-bottom:10px;} +.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} .organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} .orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 49b2906aa..a1dfe3f4d 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -77,6 +77,7 @@ h4{ font-size:14px; color:#3b3b3b;} .ml90{ margin-left:90px;} .ml100{ margin-left:100px;} .ml110{ margin-left:110px;} +.ml125 { margin-left:125px;} .ml320{ margin-left:320px;} .ml150 { margin-left:150px;} .mr-5 {margin-right:-5px;}