jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
huang 2016-06-15 15:43:42 +08:00
parent d75a8bc35a 5a7f7da1f7
commit 9b6f40bb02
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/org_subfields_controller.rb
View File

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

7
app/views/forums/create.js.erb
View File

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

2
app/views/org_subfields/create.js.erb
View File

@ -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("");