From 26081c61205d549ffadb52195bd1ddb5f7d87a2e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 6 Mar 2015 09:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8D=E9=80=89=E6=8B=A9=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/projects_helper.rb |  4 ++++
 config/locales/zh.yml          |  1 +
 db/schema.rb                   | 30 ++++++++++++++----------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index ccc750462..3c1663fcb 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -374,6 +374,10 @@ module ProjectsHelper
 
   def project_organizations_id_option
     type = []
+    option1 = []
+    option1 << l(:label_organization_choose)
+    option1 << 0
+    type << option1
     Organization.all.each do |org|
       option = []
       option << org.name
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 72634bd2b..edfea2cb7 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -539,6 +539,7 @@ zh:
   label_activity_project: '项目: '  #added by bai
 
   label_organization: 组织
+  label_organization_choose: --请选择组织--
   label_organization_name: 组织名称
   label_organization_list: 组织列表
   label_organization_new: 新建组织
diff --git a/db/schema.rb b/db/schema.rb
index 4a3b14edc..b863dbaed 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150302091345) do
+ActiveRecord::Schema.define(:version => 20150305011359) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -631,16 +631,6 @@ ActiveRecord::Schema.define(:version => 20150302091345) 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"
@@ -825,6 +815,13 @@ ActiveRecord::Schema.define(:version => 20150302091345) do
     t.integer  "project_id"
   end
 
+  create_table "organizations", :force => true do |t|
+    t.string   "name"
+    t.string   "logo_link"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "poll_answers", :force => true do |t|
     t.integer  "poll_question_id"
     t.text     "answer_text"
@@ -949,6 +946,7 @@ ActiveRecord::Schema.define(:version => 20150302091345) do
     t.integer  "user_id"
     t.integer  "dts_test",        :default => 0
     t.string   "enterprise_name"
+    t.integer  "organization_id"
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -1036,12 +1034,12 @@ ActiveRecord::Schema.define(:version => 20150302091345) do
   end
 
   create_table "roles", :force => true do |t|
-    t.string  "name",              :limit => 90
-    t.integer "position"
-    t.boolean "assignable"
-    t.integer "builtin"
+    t.string  "name",              :limit => 30, :default => "",        :null => false
+    t.integer "position",                        :default => 1
+    t.boolean "assignable",                      :default => true
+    t.integer "builtin",                         :default => 0,         :null => false
     t.text    "permissions"
-    t.string  "issues_visibility", :limit => 90
+    t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
   end
 
   create_table "schools", :force => true do |t|