Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/members_controller.rb

@@ -76,8 +76,7 @@ class MembersController < ApplicationController
               # ProjectInfo.create(:name => "test", :user_id => 123)
             end
             ## end
-            AppliedProject.deleteappiled(user_id, @project.id)
-          end
+             end
         else
           members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
           user_grades << UserGrade.new(:user_id => params[:membership][:user_id], :project_id => @project.id)
@@ -95,6 +94,13 @@ class MembersController < ApplicationController
       end
     end
 
+    if members.present? && members.all? {|m| m.valid? }
+    members.each do |member|
+      AppliedProject.deleteappiled(member.user_id, @project.id)
+    end
+
+    end
+
     respond_to do |format|
       format.html { redirect_to_settings_in_projects }
       format.js { @members = members;@applied_members = applied_members; }