From ef95835bc6ba1dedba221fb3042ef20ea35f208c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 14 Jul 2014 14:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=89=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=BA=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E9=A1=B9=E7=9B=AE=E6=A0=8F=E5=86=85=E6=97=A0?=
 =?UTF-8?q?=E8=AF=A5=E9=A1=B9=E7=9B=AE=E7=9A=84=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1d3f0ec42..540f0a312 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -490,11 +490,11 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def create  
-       
+  def create
+
     @course_tag = params[:project][:project_type]
     if(@course_tag=="1")
-      if User.current.user_extensions.identity#.include?(UserExtensions::TEACHER,UserExtensions::DEVELOPER) 
+      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]
@@ -517,7 +517,7 @@ class ProjectsController < ApplicationController
     if @course_tag == '1'
       @project.identifier = @course.extra
     end
-    if @course_tag == '1' 
+    if @course_tag == '1'
       if User.current.user_extensions.identity == 0
         if@course.save
           if validate_parent_id && @project.save
@@ -528,7 +528,7 @@ class ProjectsController < ApplicationController
               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' 
+              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
@@ -541,7 +541,7 @@ class ProjectsController < ApplicationController
                   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
@@ -574,10 +574,11 @@ class ProjectsController < ApplicationController
         end
       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?
+          #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)
@@ -587,7 +588,7 @@ class ProjectsController < ApplicationController
             end
           @project.members << m
           @project.project_infos << project
-          end
+          #end
           respond_to do |format|
             format.html {
               flash[:notice] = l(:notice_successful_create)
@@ -595,7 +596,7 @@ class ProjectsController < ApplicationController
                 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