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 << "\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"