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 @@

新增栏目

<%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %> -
+ +
确定 <% end %> 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