From 2275b367f40ea3e8e82ece62ad01d0ff355da3b6 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 29 Mar 2016 13:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8organization=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E7=9A=84show=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0layou?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index e649dffb5..0978e38d8 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -29,17 +29,11 @@ class OrganizationsController < ApplicationController helper :issues include UsersHelper before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout] - layout :select_org_layout + layout 'base_org' def index end - # 组织风格判定 - # style:为0的时候为老式风格，1 为新式风格 - def select_org_layout - (@organization.show_mode == 1 && params[:action] == "show")? 'base_org_newstyle' : 'base_org' - end - def new @organization = Organization.new render :layout => 'new_base' @@ -81,6 +75,7 @@ class OrganizationsController < ApplicationController @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)