diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f767aed10..eedb29329 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class ProjectsController < ApplicationController
   layout :select_project_layout
+
   menu_item :overview
   menu_item :roadmap, :only => :roadmap
   menu_item :settings, :only => :settings
@@ -459,24 +460,10 @@ class ProjectsController < ApplicationController
   end
 
   def new
-    @project_type        = params[:project_type] ||= params[:course]
     @issue_custom_fields = IssueCustomField.sorted.all
     @trackers            = Tracker.sorted.all
-
-    case @project_type
-    when '0' # Project
-      @project                 = Project.new
-      @project.safe_attributes = params[:project]
-    when '1' # Course
-      @project                 = Project.new
-      @project.safe_attributes = params[:project]
-      @course_tag              = params[:course]
-      @course                  = Course.new
-      @course.safe_attributes  = params[:course]
-    else # default Project
-      @project                 = Project.new
-      @project.safe_attributes = params[:project]
-    end
+    @project                 = Project.new
+    @project.safe_attributes = params[:project]
     render :layout => 'base'
   end
   
@@ -490,128 +477,43 @@ class ProjectsController < ApplicationController
   end
 
   def create
-
-    @course_tag = params[:project][:project_type]
-    if(@course_tag=="1")
-      if User.current.user_extensions.identity#.include?(UserExtensions::TEACHER,UserExtensions::DEVELOPER)
-      @course = Course.new
-      @course.extra='course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
-      @course.safe_attributes = params[:project][:course]
-      @course.tea_id = User.current.id
-      # added by bai
-      @course.term = params[:term]
-      @course.time = params[:time]
-      #@course.school_id = params[:occupation]
-      @course.school_id = User.current.user_extensions.school_id
-      @course.setup_time = params[:setup_time]
-      @course.endup_time = params[:endup_time]
-      @course.class_period = params[:class_period]
-      end
-    end
     @issue_custom_fields = IssueCustomField.sorted.all
     @trackers = Tracker.sorted.all
     @project = Project.new
-    @project.user_id = User.current.id
-    @project.dts_test = params[:project][:dts_test]
     @project.safe_attributes = params[:project]
-    if @course_tag == '1'
-      @project.identifier = @course.extra
-    end
-    if @course_tag == '1'
-      if User.current.user_extensions.identity == 0
-        if@course.save
-          if validate_parent_id && @project.save
-            @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
-            # Add current user as a project member if he is not admin
-            unless User.current.admin?
-              r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
-              m = Member.new(:user => User.current, :roles => [r])
-              project = ProjectInfo.new(:user_id => User.current.id, :project_id => @project.id)
-              user_grades =  UserGrade.create(:user_id => User.current.id, :project_id => @project.id)
-              if params[:project][:is_public] == '1'
-                 project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :grade => 0, :project_type => @course_tag)
-              end
-            @project.members << m
-            @project.project_infos << project
-            end
-            respond_to do |format|
-              format.html {
-                flash[:notice] = l(:notice_successful_create)
-                if params[:continue]
-                  attrs = {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}
-                  redirect_to new_project_path(attrs, :course => '0')
-                #Added by young
-
-                elsif params[:course_continue]
-                  redirect_to new_project_path(:course => '1')
-                #Ended by young
-                else
-                  redirect_to settings_project_path(@project,:project_type => 1)
-                end
-              }
-              format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
-            end
-          else
-            @course.destroy
-            respond_to do |format|
-              format.html { render :action => 'new', :layout => 'base'}#Added by young
-              format.api  { render_validation_errors(@project) }
-            end
-          end
-        else
-          if validate_parent_id && @project.save
-            @project.delete
-            respond_to do |format|
-              format.html { render :action => 'new', :layout => 'base'}#Added by young
-              format.api  { render_validation_errors(@project) }
-            end
+    if validate_parent_id && @project.save
+      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
+      # Add current user as a project member if he is not admin
+      #unless User.current.admin?
+      r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+      m = Member.new(:user => User.current, :roles => [r])
+      project_info = ProjectInfo.new(:user_id => User.current.id, :project_id => @project.id)
+      user_grades =  UserGrade.create(:user_id => User.current.id, :project_id => @project.id)
+      Rails.logger.debug "UserGrade created: #{user_grades.to_json}"
+      if params[:project][:is_public] == '1'
+        project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :project_type => @project.project_type)
+        Rails.logger.debug "ProjectStatus created: #{project_status.to_json}"
+      end
+      @project.members << m
+      @project.project_infos << project_info
+      #end
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_create)
+          if params[:continue]
+            attrs = {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}
+            redirect_to new_project_path(attrs, :course => '0')
           else
-            respond_to do |format|
-              format.html { render :action => 'new', :layout => 'base'}#Added by young
-              format.api  { render_validation_errors(@project) }
-            end
+            redirect_to settings_project_path(@project)
           end
-        end
+        }
+        format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
       end
     else
-      #@project.memberships.create
-      if validate_parent_id && @project.save
-          @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
-          # Add current user as a project member if he is not admin
-          #unless User.current.admin?
-            r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
-            m = Member.new(:user => User.current, :roles => [r])
-            project = ProjectInfo.new(:user_id => User.current.id, :project_id => @project.id)
-            user_grades =  UserGrade.create(:user_id => User.current.id, :project_id => @project.id)
-            if params[:project][:is_public] == '1' || @course_tag=="1"
-               project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :project_type => @project.project_type)
-            end
-          @project.members << m
-          @project.project_infos << project
-          #end
-          respond_to do |format|
-            format.html {
-              flash[:notice] = l(:notice_successful_create)
-              if params[:continue]
-                attrs = {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}
-                redirect_to new_project_path(attrs, :course => '0')
-              #Added by young
-
-              elsif params[:course_continue]
-                redirect_to new_project_path(:course => '1')
-              #Ended by young
-              else
-                redirect_to settings_project_path(@project)
-              end
-            }
-            format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
-          end
-        else
-          respond_to do |format|
-            format.html { render :action => 'new', :layout => 'base'}#Added by young
-            format.api  { render_validation_errors(@project) }
-          end
-        end
+      respond_to do |format|
+        format.html { render :action => 'new', :layout => 'base'}#Added by young
+        format.api  { render_validation_errors(@project) }
+      end
     end
   end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index d6283e44f..1a2c0504d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -758,6 +758,7 @@ class Project < ActiveRecord::Base
     'tracker_ids',
     'issue_custom_field_ids',
     'project_type',
+    'dts_test',
     'attachmenttype'