Merge branch 'rep_quality' into dev_shcool

Conflicts:
	app/models/applied_message.rb
	db/schema.rb

app/controllers/applied_project_controller.rb

@@ -1,44 +1,70 @@
 class AppliedProjectController < ApplicationController
-
+  helper :watchers
   #申请加入项目
   def applied_join_project
-    @user_id = params[:user_id]
-    @project = Project.find_by_id(params[:project_id])
-    if params[:project_join]
-      if @project
-        user = User.find @user_id
-        if user.member_of?(@project)
-          @status = 3
-        else
-          @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
-          if  @applieds.count == 0
-            appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
-            Mailer.run.applied_project(appliedproject)
-            @status = 2
-          else
-            @status = 1
-          end
-        end
-      else
-        @status = 0
-      end
-      respond_to do |format|
-        format.js
-      end
-      return
+    if params[:object_id]
+      @project = Project.find_by_id(params[:object_id])
     end
+    # @user_id = params[:user_id]
+    # if params[:project_join]
+    #   if @project
+    #     user = User.find @user_id
+    #     if user.member_of?(@project)
+    #       @status = 3
+    #     else
+    #       @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
+    #       if  @applieds.count == 0
+    #         appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
+    #         Mailer.run.applied_project(appliedproject)
+    #         @status = 2
+    #       else
+    #         @status = 1
+    #       end
+    #     end
+    #   else
+    #     @status = 0
+    #   end
+    #   respond_to do |format|
+    #     format.js
+    #   end
+    #   return
+    # end
+    #
+    # @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
+    # if  @applieds.count == 0
+    #   appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
+    #   Mailer.run.applied_project(appliedproject)
+    # end
+    #
+    # #redirect_to project_path(params[:project_id])
+    # #redirect_to_referer_or {render :text => ( 'applied success.'), :layout => true}
+    # respond_to do |format|
+    #   format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+    #   format.js { render :partial => 'set_applied'}
+    # end
+  end
 
-    @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
-    if  @applieds.count == 0
-      appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
-      Mailer.run.applied_project(appliedproject)
+  # @flage:提示语标志（1：邀请码错误；2：已经是项目成员； 3：角色没有选择; 4：申请成功）
+  # role:成员角色 => 0（4：管理人员；5：开发人员；6：报告人员）
+  # 申请成功则发送消息
+  def applied_project_info
+    if params[:project_id].nil?
+      @project = Project.where(:invite_code => params[:invite_code]).first
+    else
+      @project = Project.find(params[:project_id])
     end
-
-    #redirect_to project_path(params[:project_id])
-    #redirect_to_referer_or {render :text => ( 'applied success.'), :layout => true}
-    respond_to do |format|
-      format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_applied'}
+    if !@project || params[:invite_code].to_s != @project.invite_code
+      @flag = 1
+    elsif User.current.member_of?(@project)
+      @flag = 2
+    elsif params[:member].nil?
+      @flag = 3
+    else
+      @flag = 4
+      role = params[:member] == "member_manager" ? 3 : (params[:member] = "member_developer" ? 4 :5)
+      applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => @project.id, :role => role)
+      # 申请成功则给项目管理员发送邮件及发送消息
+      Mailer.run.applied_project(applied_project)
     end
   end
 

app/controllers/members_controller.rb

@@ -17,10 +17,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MembersController < ApplicationController
+  helper :users
   model_object Member
-  before_filter :find_model_object, :except => [:index, :create, :autocomplete]
+  before_filter :find_model_object, :except => [:index, :create, :autocomplete, :allow_to_join_project, :refused_allow_to_join_project]
   #before_filter :find_model_object_contest, :except => [:index, :create, :autocomplete]
-  before_filter :find_project_from_association, :except => [:index, :create, :autocomplete]
+  before_filter :find_project_from_association, :except => [:index, :create, :autocomplete, :allow_to_join_project, :refused_allow_to_join_project]
   before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
   before_filter :authorize
   accept_api_auth :index, :show, :create, :update, :destroy
@@ -49,6 +50,58 @@ class MembersController < ApplicationController
     end
   end
 
+  # 同意消息中申请加入项目
+  # 之所以role不在参数中传送是考虑到安全问题
+  # status(1：申请的消息；2：已操作过该消息（包括同意或者拒绝，消息状态更新）；3：决绝消息；4:被拒人收到消息；5：拒绝者收到消息；6：同意后申请人收到消息；7：同意后批准人收到消息)
+  def allow_to_join_project
+    @applied_message = AppliedMessage.find(params[:applied_message_id])
+    applied_project = @applied_message.applied
+    user = User.find(@applied_message.applied_user_id)
+    project = Project.find(applied_project.project_id)
+    if user.member_of?(project)
+      @flash_message = "您已经是项目成员了"
+      @applied_message.update_attribute(:status, 2)
+    else
+      ap_role = applied_project.try(:role)
+      if ap_role
+        begin
+          members = []
+          user_grades = []
+          project_info = []
+          members << Member.new(:role_ids => ["#{ap_role}"], :user_id => @applied_message.applied_user_id)
+          user_grades << UserGrade.new(:user_id => @applied_message.applied_user_id, :project_id => project.id)
+          role = Role.find(ap_role)
+          project_info << ProjectInfo.new(:project_id => project.id, :user_id => @applied_message.applied_user_id) if role.allowed_to?(:is_manager)
+          project.members << members
+          project.project_infos << project_info
+          project.user_grades << user_grades unless user_grades.first.user_id.nil?
+          @applied_message.update_attribute(:status, 2)
+          # 添加成功后，申请人收到消息
+          AppliedMessage.create(:user_id => @applied_message.applied_user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 6, :viewed => true, :applied_user_id => @applied_message.user_id, :role => applied_project.role)
+          # 添加成功后，批准人收到消息
+          AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 7, :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role)
+        rescue Exception => e
+          puts e
+        end
+      end
+    end
+  end
+
+  # 同意消息中拒绝加入项目
+  # params[:user_id]为申请者ID
+  # params[:send_id]为拒绝人ID
+  # status(1：申请的消息；2：已操作过该消息（包括同意或者拒绝，消息状态更新）；3：拒绝消息；4:被拒人收到消息；5：拒绝者收到消息；6：同意后申请人收到消息；7：同意后批准人收到消息)
+  def refused_allow_to_join_project
+    @applied_message = AppliedMessage.find(params[:applied_message_id])
+    @applied_message.update_attribute(:status, 3)
+    applied_project = @applied_message.applied
+    # 发送消息给被拒者,user_id对应的收到信息的用户
+    AppliedMessage.create(:user_id => @applied_message.applied_user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 4, :viewed => true, :applied_user_id => @applied_message.user_id, :role => applied_project.role)
+    # 发送消息给拒绝者
+    AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 5, :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role)
+    # applied_project.delete
+  end
+
   def create
     if params[:refusal_button]
       members = []

app/controllers/quality_analysis_controller.rb

@@ -37,7 +37,7 @@ class QualityAnalysisController < ApplicationController
         quality_an.delete unless quality_an.blank?
       end
       # Checks if the given job exists in Jenkins.
-      unless @client.job.exists?(job_name)
+      # unless @client.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
         language = swith_language_type(params[:language])
@@ -111,7 +111,7 @@ class QualityAnalysisController < ApplicationController
             end
           end
         end
-      end
+      # end
     rescue => e
       @message = e.message
     end

app/helpers/users_helper.rb

@@ -54,6 +54,44 @@ module UsersHelper
     end
   end
 
+  # 获取消息角色
+  def applied_project_message_type role
+    case role
+      when 3
+        "管理员"
+      when 4
+        "开发人员"
+      when 5
+        "报告人员"
+    end
+  end
+
+  # 判断当前用户能否对消息进行操作
+  def allow_to_show applied_message
+    (User.current.id == applied_message.user_id && applied_message.status == 1) ? true : false
+  end
+
+  # 项目申请消息通过状态判断用户
+  # status(1：申请的消息；2：已操作过该消息（包括同意或者拒绝，消息状态更新）；3：拒绝消息；4:被拒人收到消息；5：拒绝者收到消息；6：同意后申请人收到消息；7：同意后批准人收到消息)
+  def applied_project_users applied_message
+    # case applied_message.status
+    #   when 3,2,1,5,4,7,6
+    user = User.find(applied_message.applied_user_id)
+    # end
+  end
+
+  # 项目申请消息通过状态判断tip描述
+  def applied_project_tip applied_message
+    case applied_message.status
+      when 4
+        "拒绝申请加入项目:"
+      when 5,3,2,1,7
+        "申请加入项目:"
+      when 6
+        "同意申请加入项目"
+    end
+  end
+
   def get_resource_origin attach
     type = attach.container_type
     content = attach.container

app/helpers/watchers_helper.rb

@@ -364,22 +364,29 @@ module WatchersHelper
                          :class => "pr_join_a" ,:id=>id
      end
     
-    #申请加入项目
+    # 申请加入项目
     def join_in_project_link(project, user, options=[])
-      return '' unless user && user.logged?
       applied = project.applied_projects.find_by_user_id(user.id)
       text = applied ? l(:label_unapply_project) : l(:label_apply_project)
-      @applied_flag = project.instance_of?(Project)      
+      url = applied_join_project_path(:object_id => project.id)
+      method = 'post'
+      @applied_flag = project.instance_of?(Project)
       if applied
-        appliedid =  applied.id
+        link = "<a class ='pr_join_a'>#{text}</a>"
+      else
+        link = link_to(text, url, :remote => true, :method => method, :id => "#{project.id}", :class => "pr_join_a")
       end
-      id = applied_css(project)
-      url = appliedproject_path(
-        :id=>appliedid,
-        :user_id => user.id,
-        :project_id => project.id)
-      method = applied ? 'delete' : 'post'
-      link_to text, url,  :remote => true, :method => method , :class => "pr_join_a",:id => id
+      link.html_safe
+      # if applied
+      #   appliedid =  applied.id
+      # end
+      # id = applied_css(project)
+      # url = appliedproject_path(
+      #   :id=>appliedid,
+      #   :user_id => user.id,
+      #   :project_id => project.id)
+      # method = applied ? 'delete' : 'post'
+      # link_to text, url,  :remote => true, :method => method , :class => "pr_join_a",:id => id
     end
 
   def paginateHelper obj, pre_size=20

app/models/applied_message.rb

@@ -1,7 +1,6 @@
 class AppliedMessage < ActiveRecord::Base
   # status: 0表示未批准； status：1表示已批准； status： 2表示已拒绝
-  attr_accessible :applied_id, :applied_type, :status, :user_id, :viewed, :name
-  belongs_to :applied ,:polymorphic => true
+  attr_accessible :applied_id, :applied_type, :status, :user_id, :viewed, :applied_user_id, :role, :project_id, :name  belongs_to :applied ,:polymorphic => true
   belongs_to :apply_add_schools
   belongs_to :user
   has_many :message_alls, :class_name => 'MessageAll', :as =>:message,  :dependent => :destroy

app/models/applied_project.rb

@@ -1,18 +1,16 @@
 class AppliedProject < ActiveRecord::Base
-  attr_accessible :project_id, :user_id
+  attr_accessible :project_id, :user_id, :role
 
   belongs_to :user
   belongs_to :project
-  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+  has_many :applied_messages, :class_name => 'AppliedMessage', :as => :applied, :dependent => :destroy
 
   after_create :send_appliled_message
 
+  # 仅仅给项目管理人员发送消息
   def send_appliled_message
-    # if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
-    self.project.members.each do |m|
-      if m.roles.first.to_s.include?("Manager")
-        self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
-      end
+    self.project.managers.each do |member|
+      self.applied_messages << AppliedMessage.new(:user_id => member.user_id, :status => true, :viewed => false, :applied_user_id => self.user_id, :role => self.role, :project_id => self.project_id)
     end
     # end
   end

app/models/project.rb

@@ -269,6 +269,11 @@ class Project < ActiveRecord::Base
     notified.collect(&:mail)
   end
 
+  # 返回为member类型数组
+  def managers
+    self.members.includes(:roles).select{|member| member.roles[0].try(:name) == "Manager"}
+  end
+
   def initialize(attributes=nil, *args)
     super
 
@@ -905,6 +910,24 @@ class Project < ActiveRecord::Base
     User.find(self.user_id)
   end
 
+  # 延迟生成邀请码
+  def invite_code
+    return generate_invite_code
+  end
+
+  # 生成邀请码
+  # 如果已有改邀请码，则重新生成
+  CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
+  def generate_invite_code
+    code = read_attribute(:invite_code)
+    if !code || code.size <6
+      code = CODES.sample(6).join
+      return generate_invite_code if Project.where(invite_code: code).present?
+      update_attribute(:invite_code, code)
+    end
+    code
+  end
+
   private
 
   def after_parent_changed(parent_was)

app/models/user.rb

@@ -369,7 +369,8 @@ class User < Principal
     system_messages_count = SystemMessage.where("created_at >?", onclick_time).count
     at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count
     org_count = OrgMessage.where("user_id=? and viewed =? and created_at >?", user.id,0, onclick_time).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count
+    applied_count = AppliedMessage.where("user_id=? and viewed =? and created_at >?", user.id, 0, onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count + applied_count
   end
 
   # 查询指派给我的缺陷记录

app/views/applied_project/_applied_join_project.html.erb

@@ -0,0 +1,29 @@
+<div class="sy_popup_top">
+  <h3 class="fl">欢迎加入项目</h3>
+  <a href="javascript:void(0);" class="sy_icons_close fr" onclick="hideModal()"></a>
+  <div class="cl"></div>
+</div>
+<div class="sy_popup_con" style="width:370px;">
+  <%= form_tag( url_for(:controller => 'applied_project', :action => 'applied_project_info', :project_id => (@project.nil? ? nil : @project.id)), :remote => true, :id => 'project_applied_form') do %>
+      <ul class="sy_popup_add ">
+        <li>
+          <label >项目邀请码：</label>
+          <input name="invite_code" class=" sy_input_txt fl" placeholder="请输入六位项目邀请码" style="width:250px"/>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <label >身份：</label>
+          <input name="member" value="member_manager" type="radio" class="ml5 mr5 " /><span class="mr10">管理人员</span>
+          <input name="member" value="member_developer" type="radio" class="ml5 mr5 " /><span class="mr10">开发人员</span>
+          <input name="member" value="member_reporter" type="radio" class="ml5 mr5 " /><span class="mr10">报告人员</span>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <label>&nbsp;</label>
+          <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sy_btn_blue fl" onclick="$('#project_applied_form').submit();hideModal()">确&nbsp;&nbsp;定</a></div>
+          <a href="javascript:void(0);" class="sy_btn_grey fl ml20" onclick="hideModal()">取&nbsp;&nbsp;消</a>
+          <div class="cl"></div>
+        </li>
+      </ul>
+  <% end %>
+</div>

app/views/applied_project/_applied_project_tip.js.erb

@@ -0,0 +1,25 @@
+<div id="sy_popup_box" style="width:380px;">
+    <div class="sy_popup_top sy_popup_top_tishi">
+        <h3 class="fl">提示</h3>
+        <a href="javascript:void(0);" class="sy_icons_close02 fr" onclick="hideModal()"></a>
+        <div class="cl"></div>
+    </div>
+    <div class="sy_popup_con02" >
+        <ul class="sy_popup_tishi ">
+            <li>
+            <% if @flag == 1 %>
+                <p>您输入的邀请码错误</p>
+            <% elsif @flag == 2 %>
+                <p>您已经是该项目成员</p>
+            <% elsif @flag == 3 %>
+                <p>请选择一个角色</p>
+            <% elsif @flag == 4 %>
+                <p>您的申请已提交，请等待项目管理员审批</p>
+            <% end %>
+            </li>
+            <li>
+                <a href="javascript:void(0);" class="sy_btn_blue " onclick="hideModal()">知道了</a>
+            </li>
+        </ul>
+    </div>
+</div>

app/views/applied_project/applied_join_project.js.erb

@@ -1,14 +1,3 @@
-// @status: 0 该项目不存在；1 不重复加入；2 成功加入； 3 已是项目成员；其它 加入失败
-<% if @status == 0%>
-    alert("<%= l('project.join.tips.notexist') %>");
-<% elsif @status == 1%>
-    alert("<%= l('project.join.tips.repeat') %>");
-<% elsif @status == 2%>
-    alert("<%= l('project.join.tips.success') %>");
-    hideModal($("#popbox"));
-    $("#applied_project_link_<%= @project.id%>").replaceWith("<%=escape_javascript(link_to '取消申请',appliedproject_applied_path(:project_id => @project.id,:user_id => User.current.id),:class => "blue_n_btn fr mt20", :remote => "true",:method => "delete",:id => "applied_project_link_#{@project.id}")%>");
-<% elsif @status == 3%>
-    alert("<%= l('project.join.tips.has') %>");
-<%else%>
-    alert("<%= l('project.join.tips.fail') %>");
-<%end%>
+var htmlvalue = "<%= escape_javascript(render :partial => 'applied_join_project', locals: {:project_id => (@project.nil? ? nil : @project.id)}) %>";
+pop_box_new(htmlvalue,460,40,50);
+

app/views/applied_project/applied_project_info.js.erb

@@ -0,0 +1,4 @@
+var htmlvalue = "<%= escape_javascript(render :partial => 'applied_project/applied_project_tip') %>";
+pop_box_new(htmlvalue,380,40,50);
+
+//$("#join_in_project").attr('href','<%#= join_in_project_link(@project, User.current) %>');

app/views/attachments/_project_file_links.html.erb

@@ -92,7 +92,7 @@
       <% end %>
       <% if options[:author] %>
     <span class="author" title="<%= attachment.author%>">
-      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
       <%= format_time(attachment.created_on) %>
     </span>
       <% end %>

app/views/issues/_detail.html.erb

@@ -20,7 +20,7 @@
       <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span></p>
     <br>
     <div class="cl"></div>
-    由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>添加于 <%= format_time(@issue.created_on).html_safe %>
+    由<%=link_to @issue.author, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
   </div>
 
   <!--talk_txt end-->

app/views/layouts/_join_exit_project.html.erb

@@ -1,12 +1,8 @@
 <div class="pr_info_join fl">
    <!--关注:非项目成员-->
-  <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin %>
-      <span><%= watcher_link_for_project(@project, User.current) %></span>
-  <% end %>
-  <!--加入项目 -->
-  <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin  %>
-      <%= join_in_project_link(@project, User.current) %>
-  <% end %>
+  <div id="join_in_project_applied">
+    <%= render :partial => "projects/applied_status" %>
+  </div>
   <!--配置项目-->
   <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)  %>
       <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %>

app/views/layouts/base_projects.html.erb

@@ -53,7 +53,8 @@
           <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
         </div>
         <div class="pr_info_id fl mb5 f14">
-          <%= l(:label_project_id)%><%= @project.id %>
+          <%= l(:label_project_ivite_code)%>
+          <%= (User.current.member_of?(@project) || User.current.admin?) ? @project.invite_code : "******" %>
         </div>
         <!--关注、申请加入/退出项目-->
         <div id="join_exit_project_div">

app/views/layouts/new_base_user.html.erb

@@ -245,8 +245,21 @@
         </div>
         <div class="homepageLeftMenuBlock">
           <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => "homepageMenuText" %>
-          <% if is_current_user%>
-              <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%>
+          <% if is_current_user %>
+              <div class="courseMenu" id="projectMenu">
+                <ul>
+                  <li class="courseMenuIcon fr" style="margin-right:10px;"  id="courseMenuIcon">
+                    <ul class="topnav_course_menu" id="topnav_project_menu">
+                      <li>
+                        <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :class => "menuGrey"%>
+                      </li>
+                      <li>
+                        <%= link_to "加入项目", applied_join_project_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
           <% end%>
         </div>
         <%# if @user.projects.visible.count > 0
@@ -362,6 +375,12 @@
     $("#courseMenu").mouseleave(function(){
         $("#topnav_course_menu").hide();
     });
+    $("#projectMenu").mouseenter(function(){
+        $("#topnav_project_menu").show();
+    });
+    $("#projectMenu").mouseleave(function(){
+        $("#topnav_project_menu").hide();
+    });
     function leftCourseslistChange(){
         $('#homepageLeftMenuCourses').slideToggle();
         $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");

app/views/members/allow_to_join_project.js.erb

@@ -0,0 +1,5 @@
+<% if @flash_message %>
+    alert("<%= @flash_message %>");
+<% else%>
+    $("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');
+<% end%>

app/views/members/refused_allow_to_join_project.js.erb

@@ -0,0 +1 @@
+$("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');

app/views/projects/_applied_status.html.erb

@@ -0,0 +1,9 @@
+<% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin %>
+    <span><%= watcher_link_for_project(@project, User.current) %></span>
+    <!--加入项目 -->
+    <% if AppliedProject.where(:user_id => User.current, :project_id => @project_id).first.nil? %>
+        <%= join_in_project_link(@project, User.current) %>
+    <% else %>
+        等待审批
+    <% end %>
+<% end %>

app/views/projects/_development_group.html.erb

@@ -55,12 +55,6 @@
         <%= link_to "+"+l(:project_gitlab_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %>
     <% end %>
   </div>
-  <!--quality_analysis-->
-  <% unless QualityAnalysis.where(:project_id => @project.id).first.nil? %>
-        <div class="subNav">
-          <%= link_to "代码分析结果", project_quality_analysis_path(:project_id => @project.id), :class => "f14 c_blue02" %>
-        </div>
-  <% end %>
 <% end %>
 <!-- more -->
 <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>

app/views/projects/settings/_new_members.html.erb

@@ -92,32 +92,6 @@
 <% if roles.any? %>
     <div class="members_right">
       <!-- applied -->
-      <% if @project.applied_projects.any? %>
-          <div class="members_jion">
-            <p class="c_blue mb10 fb"><%= l(:label_apply_project) %></p>
-            <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
-                <div id="principals_for_applied_member">
-                  <%= render_principals_for_applied_members_new(@project) %>
-                </div>
-                <ul class="mb10">
-                  <li><%= l(:label_role_plural) %>:</li>
-                  <% roles.each do |role| %>
-                      <li>
-                        <%= check_box_tag 'membership[role_ids][]', role.id %>
-                        <label ><%= h role %></label >
-                      </li>
-                  <% end %>
-                </ul>
-                <a remote="true" href="javascript:void(0)" class="blue_btn fl" onclick="$('#new_membership').submit();">
-                  <%= l(:label_approve) %>
-                </a>
-                <a remote="true" href="javascript:void(0)" class="grey_btn fl ml10" onclick="refusal_applied_member();">
-                  <%= l(:label_refusal) %>
-                </a>
-            <% end %>
-            <div class="cl"></div>
-          </div>
-          <% end %><!--members_jion end-->
       <div class="cl"></div>
       <!-- add members -->
       <p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p>

app/views/repositories/show.html.erb

@@ -7,6 +7,10 @@
         <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %>
       <% end %>
   <% end %>
+  <!--quality_analysis-->
+  <% unless QualityAnalysis.where(:project_id => @project.id).first.nil? %>
+      <%= link_to "代码分析结果", project_quality_analysis_path(:project_id => @project.id), :class => "btn_zipdown fr" %>
+  <% end %>
 </div>
 <div class="repository_con" style="line-height:1.9;">
   <% if @entries.nil? %>

app/views/users/_user_message_applide_action.html.erb

@@ -0,0 +1,12 @@
+<% if allow_to_show(ma) %>
+    ：<%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.applied.project,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
+    <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.applied.project, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %>
+<% elsif ma.status == 4 %>
+    <span class="fontGrey3">被拒绝</span>
+<% elsif ma.status == 5 %>
+    <span class="fontGrey3">您已拒绝</span>
+<% elsif ma.status == 6 %>
+    <span class="fontGrey3">已通过</span>
+<% elsif ma.status == 7 %>
+    <span class="fontGrey3">您已同意</span>
+<% end %>

app/views/users/_user_message_applide_users.html.erb

@@ -0,0 +1,2 @@
+<%=link_to applied_project_users(ma), user_path(applied_project_users(ma)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+<span class="homepageNewsType fl"><%= applied_project_tip(ma) %></span>

app/views/users/_user_message_applied.html.erb

@@ -38,5 +38,25 @@
             <% end %>
           </li>
         </ul>
+    <% elsif ma && ma.applied_type == "AppliedProject" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.applied.user), :width => "30", :height => "30"), user_path(ma.applied.user), :target => '_blank' %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
+          </li>
+          <li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
+            以“<%= applied_project_message_type(ma.role) %>”身份加入
+            <%= link_to ma.applied.project, project_path(ma.applied.project), :class => "link-blue", :target => '_blank' %>
+          </a>
+          </li>
+          <li class="fl" style="width:71px; height:49px;">
+            <span id="applied_project_<%= ma.id %>">
+                <%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %>
+            </span>
+          </li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
     <% end %>
 <% end %>

config/locales/projects/zh.yml

@@ -48,6 +48,7 @@ zh:
   #  左边栏
   #           
   label_project_id: "项目ID:"
+  label_project_ivite_code: "邀请码:"
 
   label_agree_join_project: 同意加入
   label_apply_project: "+申请加入"
@@ -55,7 +56,7 @@ zh:
   label_exit_project: 退出项目
   label_apply_project_waiting: 已处理申请，请等待管理员审核
   label_member_of_project: 该用户已经是项目成员了！
-  label_unapply_project: 取消申请
+  label_unapply_project: 等待审批
   lable_sure_exit_project: 是否确认退出该项目
   label_friend_organization: 圈子模式
   label_research_group: 研讨模式

config/routes.rb

@@ -721,8 +721,9 @@ RedmineApp::Application.routes.draw do
   post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
   delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
 
-  post 'appliedproject/applied', :to => 'applied_project#applied_join_project', :as => 'appliedproject'
-  delete 'appliedproject/applied', :to => 'applied_project#unapplied_join_project'
+  post 'applied_project/applied_join', :to => 'applied_project#applied_join_project', :as => 'applied_join_project'
+  post 'applied_project/applied_project_info', :to => 'applied_project#applied_project_info', :as => 'applied_project_info'
+  delete 'applied_project/applied', :to => 'applied_project#unapplied_join_project', :as => 'unapplied_join_project'
 
   resources :projects do
     member do
@@ -766,6 +767,8 @@ RedmineApp::Application.routes.draw do
       collection do
         get 'autocomplete'
         get 'appliedproject'
+        post 'allow_to_join_project'
+        get 'refused_allow_to_join_project'
       end
     end
 

db/migrate/20160725062343_add_invite_code_to_project.rb

@@ -0,0 +1,5 @@
+class AddInviteCodeToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :invite_code, :string
+  end
+end

db/migrate/20160728041943_add_qrcode_to_project.rb

@@ -0,0 +1,5 @@
+class AddQrcodeToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :qrcode, :string
+  end
+end

db/migrate/20160728075947_add_role_to_applied_project.rb

@@ -0,0 +1,5 @@
+class AddRoleToAppliedProject < ActiveRecord::Migration
+  def change
+    add_column :applied_projects, :role, :integer, :default => 0
+  end
+end

db/migrate/20160729020903_add_applied_user_id_to_applied_message.rb

@@ -0,0 +1,5 @@
+class AddAppliedUserIdToAppliedMessage < ActiveRecord::Migration
+  def change
+    add_column :applied_messages, :applied_user_id, :integer
+  end
+end

db/migrate/20160729124038_add_role_to_applied_message.rb

@@ -0,0 +1,5 @@
+class AddRoleToAppliedMessage < ActiveRecord::Migration
+  def change
+    add_column :applied_messages, :role, :integer
+  end
+end

db/migrate/20160729124833_add_project_id_to_applied_message.rb

@@ -0,0 +1,5 @@
+class AddProjectIdToAppliedMessage < ActiveRecord::Migration
+  def change
+    add_column :applied_messages, :project_id, :integer
+  end
+end

public/javascripts/application.js

@@ -1492,6 +1492,25 @@ function pop_up_box(value,tWidth,tTop,tLeft){
     }
 }
 
+// 公共弹框样式
+function pop_box_new(value, Width, Top, Left){
+    $("#ajax-modal").html(value);
+    showModal('ajax-modal', Width + 'px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').parent().css({"top": Top+"%","left": Left+"%","transform":"translate(-50%,-50%)","padding":"0","border":"none"});
+    $('#ajax-modal').css({"padding":"0"});
+
+}
+
+// 公共提示弹框样式
+//function pop_box_tip_new(value, Width, Top, Left){
+//    $("#ajax-modal").html(value);
+//    showModal('ajax-modal', Width + 'px');
+//    $('#ajax-modal').siblings().remove();
+//    $('#ajax-modal').parent().css({"top": Top+"%","left": Left+"%","transform":"translate(-50%,-50%)","padding":"0","border":"none"});
+//    $('#ajax-modal').css({"padding":"0"});
+//}
+
 //显示的时候根据当前网址是http 还是https 选择视频显示方式直接显示还是弹框
 function autoMedia(id){
     var rootPath = getRootPath();

public/stylesheets/css/common.css

@@ -542,6 +542,37 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .borderRadius {border-radius:5px;}
 a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.Blue-btn{ background:#3598db; color:#fff;}
+
+/*20160725 项目申请按钮*/
+a.sy_btn_grey{
+    color: #333;
+    background: #e1e1e1;
+    text-align: center;
+    font-size: 12px;
+    padding:0 15px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.sy_btn_grey{ background: #c3c3c3;}
+a.sy_btn_blue{
+    display:block;
+    width:80px;
+    height: 30px;
+    text-align:center;
+    color: #fff;
+    background: #3b94d6;
+    font-size: 12px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.sy_btn_blue{ background: #2788d0;}
 /* commonpic */
 .pic_date{ display:block; background:url(/images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; }
 .pic_add{ display:block; background:url(/images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; }

public/stylesheets/css/popup.css

@@ -332,4 +332,97 @@ a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: no
 .relatePWrap{max-height: 210px;overflow:hidden;}
 
 /*20160622代码分析弹窗*/
-.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
+.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
+
+/*公共弹框*/
+/* 按钮*/
+
+
+
+
+
+/* 加入班级弹窗 */
+#sy_popup_box{
+    width:460px;
+    background:#fff;
+    padding-bottom:30px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+}
+.sy_popup_top{
+    background:#3b94d6;
+    height:40px;
+    -webkit-border-radius: 5px 5px 0px 0px;
+    -moz-border-radius: 5px 5px 0px 0px;
+    -o-border-radius: 5px 5px 0px 0px;
+    border-radius: 5px 5px 0px 0px;
+}
+.sy_popup_top h3{
+    font-size:18px;
+    color:#fff;
+    font-weight:normal;
+    line-height:40px;
+    padding-left:10px;
+}
+a.sy_icons_close{
+    width:20px;
+    height:20px;
+    display:block;
+    background: url(/images/sy/sy_icons_close.png) 0 0px no-repeat;
+    margin:8px 10px 0 0;
+}
+a:hover.sy_icons_close{
+    background: url(/images/sy/sy_icons_close.png) -40px 0px no-repeat;
+}
+.sy_popup_con{
+    margin:30px auto 0;
+    font-size:14px;
+    width:330px;
+}
+.sy_popup_add label{
+    display:block;
+    float:left;
+    width:85px;
+    text-align:right;
+    line-height:40px;
+}
+.sy_popup_add li{
+    line-height:40px;
+}
+.sy_input_txt{
+    border:1px solid #dedede;
+    height:36px;
+    background:#fff;
+    padding:0 5px;
+    width:220px;
+}
+.sy_popup_con02{
+    margin:30px auto 0;
+    font-size:14px;
+    text-align:center;
+    width:360px;
+}
+.sy_popup_con02 ul li p{
+    margin-bottom:15px;
+    text-align:center;
+    font-size:14px;
+    color:#616161;
+}
+.sy_popup_con02 a{ margin:0 auto;}
+.sy_popup_top_tishi{ background:#ededed; }
+.sy_popup_top_tishi h3{color:#616161; font-size:16px;}
+a.sy_icons_close02{
+    width:20px;
+    height:20px;
+    display:block;
+    background: url(/images/sy/sy_icons_close02.png) 0 0px no-repeat;
+    margin:8px 10px 0 0;
+    border: none;
+    outline: none;
+}
+a:hover.sy_icons_close02{
+    background: url(/images/sy/sy_icons_close02.png) -40px 0px no-repeat;
+}

public/stylesheets/sy_public.css

@@ -62,34 +62,34 @@ a.sy_btn_green{
     border-radius:3px;
 }
 a:hover.sy_btn_green{ background: #51a74f;}
-a.sy_btn_grey{
-    color: #333;
-    background: #e1e1e1;
-    text-align: center;
-    font-size: 12px;
-    padding:0 15px;
-    height: 30px;
-    line-height: 30px;
-    -webkit-border-radius:3px;
-    -moz-border-radius:3px;
-    -o-border-radius:3px;
-    border-radius:3px;
-}
-a:hover.sy_btn_grey{ background: #c3c3c3;}
-a.sy_btn_blue{
-    color: #fff;
-    background: #3b94d6;
-    text-align: center;
-    font-size: 12px;
-    padding:0 15px;
-    height: 30px;
-    line-height: 30px;
-    -webkit-border-radius:3px;
-    -moz-border-radius:3px;
-    -o-border-radius:3px;
-    border-radius:3px;
-}
-a:hover.sy_btn_blue{ background: #2788d0;}
+/*a.sy_btn_grey{*/
+    /*color: #333;*/
+    /*background: #e1e1e1;*/
+    /*text-align: center;*/
+    /*font-size: 12px;*/
+    /*padding:0 15px;*/
+    /*height: 30px;*/
+    /*line-height: 30px;*/
+    /*-webkit-border-radius:3px;*/
+    /*-moz-border-radius:3px;*/
+    /*-o-border-radius:3px;*/
+    /*border-radius:3px;*/
+/*}*/
+/*a:hover.sy_btn_grey{ background: #c3c3c3;}*/
+/*a.sy_btn_blue{*/
+    /*color: #fff;*/
+    /*background: #3b94d6;*/
+    /*text-align: center;*/
+    /*font-size: 12px;*/
+    /*padding:0 15px;*/
+    /*height: 30px;*/
+    /*line-height: 30px;*/
+    /*-webkit-border-radius:3px;*/
+    /*-moz-border-radius:3px;*/
+    /*-o-border-radius:3px;*/
+    /*border-radius:3px;*/
+/*}*/
+/*a:hover.sy_btn_blue{ background: #2788d0;}*/
 /* 排序 */
 .sy_category{
     height: 50px;