From 2a4486bf0dd6f078ee4d77e31de12b23cc84e807 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Mon, 16 Jun 2014 14:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=81=E7=A7=BB=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb                | 1 -
 app/helpers/application_helper.rb                    | 4 ++--
 db/migrate/20140603042015_stored_course_procedure.rb | 4 ++--
 db/schema.rb                                         | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 492762333..a5211fc9d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -225,7 +225,6 @@ class CoursesController < ApplicationController
       @course.setup_time = params[:setup_time]
       @course.endup_time = params[:endup_time]
       @course.class_period = params[:class_period]
-      @course.description = params[:description]
     end
 
     @issue_custom_fields = IssueCustomField.sorted.all
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 53982482b..400a12326 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -320,12 +320,12 @@ module ApplicationHelper
       courses.each do |course|
         # set the project environment to please macros.
         @course = course
-        if (ancestors.empty? || course.is_descendant_of?(ancestors.last))
+        if (ancestors.empty? )#|| course.is_descendant_of?(ancestors.last))
           s << "<ul class=courses'>\n"
         else
           ancestors.pop
           s << "</li>"
-          while (ancestors.any? && !course.is_descendant_of?(ancestors.last))
+          while (ancestors.any? )#&& !course.is_descendant_of?(ancestors.last))
             ancestors.pop
             s << "</ul></li>\n"
           end
diff --git a/db/migrate/20140603042015_stored_course_procedure.rb b/db/migrate/20140603042015_stored_course_procedure.rb
index 6c31279e1..5dd6bc383 100644
--- a/db/migrate/20140603042015_stored_course_procedure.rb
+++ b/db/migrate/20140603042015_stored_course_procedure.rb
@@ -12,8 +12,8 @@ class StoredCourseProcedure < ActiveRecord::Migration
           course.description = project.description
           course.status = project.status
           course.attachmenttype = 2
-          course.lft = project.lft
-          course.rgt = project.rgt
+          #course.lft = project.lft
+          #course.rgt = project.rgt
           course.save
 
           # 更新状态表
diff --git a/db/schema.rb b/db/schema.rb
index 6faf0a82f..ccc7b052f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -528,7 +528,7 @@ ActiveRecord::Schema.define(:version => 20140611161801) do
     t.integer  "project_id",        :default => 0
     t.datetime "created_on"
     t.boolean  "mail_notification", :default => false, :null => false
-    t.integer  "course_id"
+    t.integer  "course_id",         :default => -1
   end
 
   add_index "members", ["project_id"], :name => "index_members_on_project_id"