diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index ae1119609..098cefceb 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -29,7 +29,7 @@ class OrganizationsController < ApplicationController helper :issues include UsersHelper include OrganizationsHelper - before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students, :projects, :courses] + before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout, :teachers, :students, :projects, :courses, :acts] # before_filter :allow_as_admin, :only => [:students, :teachers, :projects, :courses, :acts] layout 'base_org' def index @@ -265,6 +265,13 @@ class OrganizationsController < ApplicationController end def acts + @subfield_content = @organization.org_subfields.order("priority") + @org_subfield = OrgSubfield.where(:id => params[:org_subfield_id]).first + @subfield_acts = get_subfield_acts(@org_subfield) + respond_to do |format| + format.html{render :layout => 'base_org_custom'} + format.js + end end def searchmember_by_name members, name diff --git a/app/views/organizations/_show_custom_org_subfield.html.erb b/app/views/organizations/_show_custom_org_subfield.html.erb index 10ac31637..54416b6f0 100644 --- a/app/views/organizations/_show_custom_org_subfield.html.erb +++ b/app/views/organizations/_show_custom_org_subfield.html.erb @@ -1,4 +1,5 @@ <% if @subfield_acts.blank? %> +
该模块暂时没有相关内容
<% else %>该模块暂时没有相关内容
+<% else %> +