Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

Gemfile

@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
-gem "test-unit", "~>3.0" 
+gem "test-unit", "~>3.0"
 
 ### profile
-# gem 'oneapm_rpm'
+gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

app/controllers/applied_project_controller.rb

@@ -59,6 +59,8 @@ class AppliedProjectController < ApplicationController
       @flag = 2
     elsif params[:member].nil?
       @flag = 3
+    elsif !AppliedProject.where(:project_id => @project.id, :user_id => User.current.id).first.nil?
+      @flag = 5
     else
       @flag = 4
       role = params[:member] == "member_manager" ? 3 : (params[:member] == "member_developer" ? 4 :5)

app/views/applied_project/_applied_project_tip.js.erb

@@ -15,6 +15,8 @@
                 <p>请选择一个角色</p>
             <% elsif @flag == 4 %>
                 <p>您的申请已提交，请等待项目管理员审批</p>
+             <% elsif @flag == 5 %>
+                <p>您已经申请加入该项目了，请耐心等待</p>
             <% end %>
             </li>
             <li>