+
<%= field.subfield_subdomain_dir.nil? ? '未设置': field.subfield_subdomain_dir.name %>
<% else %>
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 775bc7e6a..1ab51b3af 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -75,9 +75,9 @@
显示模式 :
/>
-
+
/>
-
+
公开 :
class="ml3" />
diff --git a/db/migrate/20160612030537_update_org_subfiled_default.rb b/db/migrate/20160612030537_update_org_subfiled_default.rb
new file mode 100644
index 000000000..48355c321
--- /dev/null
+++ b/db/migrate/20160612030537_update_org_subfiled_default.rb
@@ -0,0 +1,10 @@
+class UpdateOrgSubfiledDefault < ActiveRecord::Migration
+ def up
+ OrgSubfield.where(:name => "activity").update_all(:status => false)
+ OrgSubfield.where(:name => "course").update_all(:status => 2)
+ OrgSubfield.where(:name => "project").update_all(:status => 2)
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20160612043259_update_org_subfiled_resource.rb b/db/migrate/20160612043259_update_org_subfiled_resource.rb
new file mode 100644
index 000000000..ec0bd616e
--- /dev/null
+++ b/db/migrate/20160612043259_update_org_subfiled_resource.rb
@@ -0,0 +1,8 @@
+class UpdateOrgSubfiledResource < ActiveRecord::Migration
+ def up
+ OrgSubfield.where(:field_type => "Resource").update_all(:status => 6)
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 504849d39..0a1408e7e 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 => 20160606064856) do
+ActiveRecord::Schema.define(:version => 20160612043259) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false