From 2f7260cba2e8cc151f18bd32665d6a82fb47acc8 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 9 Dec 2015 17:24:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9C=A8=E6=A0=8F=E7=9B=AE=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0field=5Ftype(=E7=B1=BB=E5=9E=8B)=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9B=202.=E5=9C=A8=E7=BB=84=E7=BB=87=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE-=E3=80=8B=E6=A0=8F=E7=9B=AE=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=8F=E7=9B=AE=E7=B1=BB=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_subfields_controller.rb         |  2 +-
 app/views/org_subfields/create.js.erb               |  3 ++-
 app/views/organizations/setting.html.erb            | 13 ++++++++++++-
 .../20151209085900_add_type_to_org_subfields.rb     |  5 +++++
 .../20151209085942_set_type_for_org_subfields.rb    | 10 ++++++++++
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20151209085900_add_type_to_org_subfields.rb
 create mode 100644 db/migrate/20151209085942_set_type_for_org_subfields.rb

diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 6fdf0ae40..00b88fdaa 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -3,7 +3,7 @@ class OrgSubfieldsController < ApplicationController
     @subfield = OrgSubfield.create(:name => params[:name])
     @organization = Organization.find(params[:organization_id])
     @organization.org_subfields << @subfield
-    @subfield.update_attributes(:priority => @subfield.id)
+    @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type])
   end
 
   def destroy
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 8a676e93e..f29799707 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,4 +1,5 @@
 $("#org_subfield_list").html("");
 $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>");
 $("#sub_field_left_lists").html("");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#subfield_name").val("");
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index e0f262b99..4fc20653a 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -114,7 +114,18 @@
             <p class="fontBlue fb mb5">新增栏目</p>
             <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
             <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb20" />
-                <div class="cl"></div>
+            <ul class="orgAddRole">
+              <li class="fontGrey3 fb mb10">栏目类型</li>
+              <li>
+                <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+                <label for="orgMng">帖子</label>
+              </li>
+              <li>
+                <input type="radio" id="orgMeb" value="Resource" name="field_type" />
+                <label for="orgMeb">资源</label>
+              </li>
+            </ul>
+            <div class="cl"></div>
             <a href="javascript:void(0);" class="saveBtn db fl mt10" onclick="add_org_subfield();">确定</a>
             <% end %>
           </div>
diff --git a/db/migrate/20151209085900_add_type_to_org_subfields.rb b/db/migrate/20151209085900_add_type_to_org_subfields.rb
new file mode 100644
index 000000000..3616a1eb4
--- /dev/null
+++ b/db/migrate/20151209085900_add_type_to_org_subfields.rb
@@ -0,0 +1,5 @@
+class AddTypeToOrgSubfields < ActiveRecord::Migration
+  def change
+    add_column :org_subfields, :field_type, :string
+  end
+end
diff --git a/db/migrate/20151209085942_set_type_for_org_subfields.rb b/db/migrate/20151209085942_set_type_for_org_subfields.rb
new file mode 100644
index 000000000..0ce313234
--- /dev/null
+++ b/db/migrate/20151209085942_set_type_for_org_subfields.rb
@@ -0,0 +1,10 @@
+class SetTypeForOrgSubfields < ActiveRecord::Migration
+  def up
+    OrgSubfield.all.each do |field|
+      field.update_attribute(:field_type, "Post")
+    end
+  end
+
+  def down
+  end
+end