Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/org_subfields_controller.rb

@@ -14,10 +14,9 @@ class OrgSubfieldsController < ApplicationController
           SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
-      #默认类型为帖子
-      @subfield.update_attributes(:field_type => params[:field_type]||"Post")
+      @subfield.update_attributes(:field_type => params[:field_type])
       # admin配置的类型
-      update_status_by_type(@subfield, params[:field_type]||"Post")
+      update_status_by_type(@subfield, params[:field_type])
     else
       @res = false
     end

app/views/forums/create.js.erb

@@ -1,7 +1,6 @@
 <%if @save_flag%>
-//$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
-//$('#reorder_time').click();
-    window.location.href= "http://"+"<%= Setting.host_name%>"+"/forums/" + "<%= @forum.id%>"
+$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle();
+$('#reorder_time').click();
 <%else%>
- $("#error").html("<%= @forum.errors.full_messages[0]%>").show();
+$("#error").html("<%= @forum.errors.full_messages[0]%>").show();
 <%end %>

app/views/org_subfields/create.js.erb

@@ -4,8 +4,6 @@
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
     $("#org_custom_admin").html("<%= escape_javascript(render :partial => 'organizations/org_custom_admin') %>");
-    //默认选中第一个
-    $("input[name='field_type']").get(0).checked=true;
 <% end %>
 $("#subfield_name").val("");
 $("#sub_dir").val("");