From 7338f0d44ea253b322676102ecbe346c59eca7bb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 1 Jul 2015 10:02:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E5=96=84=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E7=9A=84=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 27 ++++++++++-----------------
 app/services/courses_service.rb       |  4 +++-
 config/locales/zh.yml                 |  1 +
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 3b25438df..00d740ee7 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -443,26 +443,19 @@ class CoursesController < ApplicationController
   def create
     cs = CoursesService.new
     @course = cs.create_course(params,User.current)[:course]
-    if @course.new_record?
+    if @course
       respond_to do |format|
-        format.html { render :action => 'new', :layout => 'new_base' } #Added by young
-        format.api { render_validation_errors(@course) }
+        flash[:notice] = l(:notice_successful_create)
+        format.html {redirect_to settings_course_url(@course, :course_type => 1)}
+        format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
       end
     else
       respond_to do |format|
-              format.html {
-                # render :layout => 'base_courses'
-                flash[:notice] = l(:notice_successful_create)
-                if params[:continue]
-                  redirect_to new_course_url(attrs, :course => '0')
-                elsif params[:course_continue]
-                  redirect_to new_course_url(:course => '1')
-                else
-                  redirect_to settings_course_url(@course, :course_type => 1)
-                end
-              }
-              format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
-            end
+        flash[:notice] = l(:notice_create_failed)
+        # @course = Course.new
+        format.html { redirect_to new_course_path } #Added by young
+        format.api { render_validation_errors(@course) }
+      end
     end
   end
 
@@ -532,7 +525,7 @@ class CoursesController < ApplicationController
     @trackers = Tracker.sorted.all
     @course = Course.new
     @course.safe_attributes = params[:course]
-    month = Time.now.month
+    # month = Time.now.month
     render :layout => 'new_base'
   end
 
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index f5ff2670f..68177552c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -201,12 +201,14 @@ class CoursesService
       @course.class_period = params[:class_period].to_i
       params[:course][:is_public] ? @course.is_public = 1 : @course.is_public = 0
       params[:course][:open_student] ? @course.open_student = 1 : @course.open_student = 0
+    else
+
     end
 
     @issue_custom_fields = IssueCustomField.sorted.all
     @trackers = Tracker.sorted.all
 
-    if @course.save
+    if @course && @course.save
       #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 => current_user, :roles => [r])
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2a538138d..1aab2a22c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -12,6 +12,7 @@ zh:
   notice_account_wrong_password: 密码错误
   name_can_be_empty: 可以不填写真实姓名[保密所需]
   notice_successful_create: 创建成功
+  notice_create_failed: 创建失败，请先完善个人信息
   notice_failed_create: 创建失败
   notice_successful_update: 更新成功
   notice_successful_edit: 修改成功