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

app/controllers/applied_project_controller.rb

@@ -1,8 +1,10 @@
 class AppliedProjectController < ApplicationController
-
+  helper :watchers
   #申请加入项目
   def applied_join_project
-    @project = Project.find_by_id(params[:object_id])
+    if params[:object_id]
+      @project = Project.find_by_id(params[:object_id])
+    end
     # @user_id = params[:user_id]
     # if params[:project_join]
     #   if @project
@@ -43,11 +45,15 @@ class AppliedProjectController < ApplicationController
   end
 
   # @flage:提示语标志（1：邀请码错误；2：已经是项目成员； 3：角色没有选择; 4：申请成功）
-  # role:成员角色 => 0（1：管理人员；2：开发人员；3：报告人员）
+  # role:成员角色 => 0（4：管理人员；5：开发人员；6：报告人员）
   # 申请成功则发送消息
   def applied_project_info
-    @project = Project.find(params[:project_id])
-    if params[:invite_code].to_s != @project.invite_code
+    if params[:project_id].nil?
+      @project = Project.where(:invite_code => params[:invite_code]).first
+    else
+      @project = Project.find(params[:project_id])
+    end
+    if !@project || params[:invite_code].to_s != @project.invite_code
       @flag = 1
     elsif User.current.member_of?(@project)
       @flag = 2
@@ -55,8 +61,8 @@ class AppliedProjectController < ApplicationController
       @flag = 3
     else
       @flag = 4
-      role = params[:member] == "member_manager" ? 1 : (params[:member] = "member_developer" ? 2 : 3)
-      applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => params[:project_id], :role => role)
+      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

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,62 @@ 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, :project_id => applied_project.project_id)
+          # 添加成功后，批准人收到消息
+          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, :project_id => applied_project.project_id)
+        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, :project_id => applied_project.project_id)
+    # 发送消息给拒绝者
+    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, :project_id => applied_project.project_id)
+    applied_project.delete
+  end
+
   def create
     if params[:refusal_button]
       members = []
@@ -318,6 +375,11 @@ class MembersController < ApplicationController
             grade.destroy
           end
         end
+        # 移出的时候删除申请消息,不需要删除消息，所以不必要关联删除
+        applied_projects = AppliedProject.where(:project_id => @project.id, :user_id => @member.user_id).first
+        unless applied_projects.nil?
+          applied_projects.delete
+        end
         #移出项目发送消息
         ForgeMessage.create(:user_id => @member.user_id, :project_id => @project.id, :forge_message_type => "RemoveFromProject", :viewed => false, :forge_message_id => User.current.id)
       end

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

@@ -57,15 +57,41 @@ module UsersHelper
   # 获取消息角色
   def applied_project_message_type role
     case role
-      when 1
-        "管理员"
-      when 2
-        "开发人员"
       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/models/applied_message.rb

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

app/models/applied_project.rb

@@ -10,7 +10,7 @@ class AppliedProject < ActiveRecord::Base
   # 仅仅给项目管理人员发送消息
   def send_appliled_message
     self.project.managers.each do |member|
-      self.applied_messages << AppliedMessage.new(:user_id => member.user_id, :status => true, :viewed => false)
+      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

@@ -920,8 +920,8 @@ class Project < ActiveRecord::Base
   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 <5
-      code = CODES.sample(5).join
+    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

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

@@ -4,7 +4,7 @@
   <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.id), :remote => true, :id => 'project_applied_form') do %>
+  <%= 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>

app/views/applied_project/applied_join_project.js.erb

@@ -1,3 +1,3 @@
-var htmlvalue = "<%= escape_javascript(render :partial => 'applied_join_project', locals: {:project_id => @project.id}) %>";
+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

@@ -1,3 +1,5 @@
-var htmlvalue = "<%= escape_javascript(render :partial => 'applied_project/applied_project_tip', locals: {:project_id => @project.id}) %>";
+<% if @project %>
+$("#join_in_project_applied").html('<%= escape_javascript( render :partial => 'projects/applied_status') %>');
+<% end %>
+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/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>
-  <!--加入项目 -->
-      <span id="join_in_project">
-        <%= join_in_project_link(@project, User.current) %>
-      </span>
-  <% 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/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.project_id,  :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.project_id, :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

@@ -33,18 +33,22 @@
     <% 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>
+            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
           </li>
           <li class="homepageNewsPubType fl">
-            <%=link_to ma.applied.user, user_path(ma.applied.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申请加入项目：</span>
+            <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
           </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            以“<%= applied_project_message_type(ma.applied.role) %>”身份加入
-            <%= link_to ma.applied.project, settings_project_path(:id => ma.applied.project.id, :tab => "members"), :class => "link-blue", :target => '_blank' %>
-            ：同意 | 拒绝
+          <li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
+            以“<%= applied_project_message_type(ma.role) %>”身份加入
+            <% project = Project.find(ma.project_id) %>
+            <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
           </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 %>

config/routes.rb

@@ -770,6 +770,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/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

@@ -1499,6 +1499,7 @@ function pop_box_new(value, Width, Top, Left){
     $('#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"});
+
 }
 
 // 公共提示弹框样式