<%= field.name %>
activity zone
<%= field.name %>
discussion zone
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 0978e38d8..bc1a6a003 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -70,13 +70,12 @@ class OrganizationsController < ApplicationController def show # 组织新类型 show_mode:判断标准 1为新类型,0为旧 - if @organization.show_mode == 1 + if @organization.show_mode == 1 && params[:org_subfield_id].nil? @subfield_content = @organization.org_subfields.order("priority") @project_acts = get_project_activities_org @organization @course_acts_homework = get_course_homework_activities_org @organization @course_acts_message = get_course_message_activities_org @organization render :layout => 'base_org_newstyle' - else if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @organization = Organization.find(params[:id]) diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb index 4a9dec200..315d53e9d 100644 --- a/app/views/layouts/base_org_newstyle.html.erb +++ b/app/views/layouts/base_org_newstyle.html.erb @@ -210,24 +210,13 @@ <% end %> <% else %> - <% if field.field_type == "Post" %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> <% message_ats = get_message_org(@organization.id, field.id) %>
activity zone
discussion zone