From f4595dfcd295e807c39c619afce9d2dbc253971e Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 25 Apr 2014 08:29:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=8B=8D?=
 =?UTF-8?q?=E6=AE=B5project=E3=80=81course=E6=96=B9=E5=BC=8F=20projectlist?=
 =?UTF-8?q?=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb |  2 +-
 app/helpers/application_helper.rb      | 15 +++------------
 app/helpers/projects_helper.rb         |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index cd74cd08f..95fbed1d3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -128,7 +128,7 @@ class ProjectsController < ApplicationController
 
   def index
     #Modified by nie
-    @project_type = params[:project_type]
+    @project_type = params[:project_type].to_i
     per_page_option = 10
 
     @projects_all = Project.active.visible.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9d18f81c9..859b19655 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -255,26 +255,17 @@ module ApplicationHelper
         end
         classes = (ancestors.empty? ? 'root' : 'child')
         s << "<li class='project-table'><div class='#{classes}'>"
-        if params[:project_type] == "0"
+        if project.try(:project_type) == Project::ProjectType_project
           s << h(block_given? ? yield(project) : project.name)
         else
         end
         
-        # if @project.project_type == 1
-          # unless Course.find_by_extra(@project.identifier).nil?
-          # unless  Course.find_by_extra(@project.identifier).tea_id == User.current.id
-            # s << "<span style = 'float: right;'>"
-            # s << join_in_course(@project, User.current)#, ['whiteButton'])
-            # s << "</span>"
-          # end
-          # end
-        # end
-        if params[:project_type] == "0"
+        if project.try(:project_type) == Project::ProjectType_project
           unless User.current.member_of?(@project)
           s << "<span style = 'float: right;'>"
           s << watcher_link(@project, User.current)#, ['whiteButton'])
           s << "</span>"
-        end
+          end
           s << (render :partial => 'projects/project', :locals => {:project => project}).to_s
         else
           s <<  (render :partial => 'projects/course', :locals => {:project => project}).to_s
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 44fb5d564..5bd677bdf 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -175,7 +175,7 @@ module ProjectsHelper
   def render_project_hierarchy(projects)
     render_project_nested_lists(projects) do |project|
       #Modified by young
-        if (project.project_type==1)
+        if (project.try(:project_type) == Project::ProjectType_course )
           s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe
         else
           s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")