From 6877ff7e8d53369534044a480bb46244753679e5 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Thu, 20 Mar 2014 14:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=BE=E7=BD=AE=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC404.bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 21 ++++++++++++++-------
 app/models/project.rb                  |  2 ++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 9a9518eb3..0c98b804e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -16,7 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class ProjectsController < ApplicationController
   # if @project.project_type == 1
-  layout 'base_projects'# by young
+  # layout 'base_projects'# by young
+  layout :select_project_layout
   menu_item :overview
   menu_item :roadmap, :only => :roadmap
   menu_item :settings, :only => :settings
@@ -614,12 +615,12 @@ class ProjectsController < ApplicationController
     #Added by young
     # @course_tag = params[:course]
     # if @course_tag == '1'
-    if @project.project_type == 1
-       @course = Course.find_by_extra(@project.identifier)
-      render :layout => 'base_courses'
-    else
-      render :layout => 'base_projects'
-    end
+    @course = Course.find_by_extra(@project.identifier)
+    # if @project.project_type == 1
+    #   render :layout => 'base_courses'
+    # else
+    #   render :layout => 'base_projects'
+    # end
   #Ended by young
   end
 
@@ -837,6 +838,12 @@ class ProjectsController < ApplicationController
 
   private
 
+  def select_project_layout
+    project = Project.find_by_id(params[:id])
+    project ||= @project
+    (project.project_type == Project::ProjectType_project) ? 'base_projects' : 'base_courses'
+  end
+
   # Validates parent_id param according to user's permissions
   # TODO: move it to Project model in a validation that depends on User.current
   def validate_parent_id
diff --git a/app/models/project.rb b/app/models/project.rb
index 3205db8fa..3f91d8c2f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -17,6 +17,8 @@
 
 class Project < ActiveRecord::Base
   include Redmine::SafeAttributes
+  ProjectType_project = 0
+  ProjectType_course = 1
 
   # Project statuses
   STATUS_ACTIVE     = 1