Merge branch 'develop' into 'develop'

gitlab api中 删除操作返回异常的问题 pull相关提醒策略修改 里程碑issue统计（戴傲）



See merge request !19

app/controllers/versions_controller.rb

@@ -125,7 +125,8 @@ class VersionsController < ApplicationController
       @issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1
       # @offset ||= @issue_pages.offset
       @issues = paginateHelper @version_issues, @limit
-      @version_issue_assigned_name = @version_issues.group_by(&:assigned_to_id)
+      @version_issue_assigned_name = @version_issues.sort_by{ |i| Issue.where(:project_id => @project.id ,
+                                                        :assigned_to_id => i.assigned_to_id, :fixed_version_id => @version.id).count }.reverse.group_by(&:assigned_to_id)
       format.html {
        # @issues = @version.fixed_issues.visible.
        #   includes(:status, :tracker, :priority).

app/views/layouts/_base_project_top.html.erb

@@ -19,8 +19,8 @@
   <div class="cl"></div>
   <% unless @project.forked_from_project_id.nil? %>
       <div class="fl pro_new_name ml15 clear mt5">
-        <span class="vl_fork fl mr5 mt2">forked from</span> <%=link_to "#{get_fork_from_project(@project.forked_from_project_id).owner.try(:show_name)}<span class='ml5 mr5'>/</span>".html_safe, user_path(get_fork_from_project(@project.forked_from_project_id).owner), :class => "pro_new_username_fork fl" %>
-        <%=link_to get_fork_from_project(@project.forked_from_project_id).name, project_path(get_fork_from_project(@project.forked_from_project_id)), :class => "pro_new_username_fork fl" %>
+        <span class="vl_fork fl mr5 mt2">forked from</span> <%=link_to "#{get_fork_from_project(@project.forked_from_project_id).owner.try(:show_name)}<span class='ml5 mr5'>/</span>".html_safe, user_path(get_fork_from_project(@project.forked_from_project_id).owner), :class => "pro_new_username_fork fl", :target => "_blank" %>
+        <%=link_to get_fork_from_project(@project.forked_from_project_id).name, project_path(get_fork_from_project(@project.forked_from_project_id)), :class => "pro_new_username_fork fl", :target => "_blank" %>
       </div>
       <div class="cl"></div>
   <% end %>

app/views/pull_requests/_show.html.erb

@@ -31,15 +31,7 @@
       改动已合并至 <%= @request.target_branch %> 分支
     </div>
 <% else %>
-    <% if is_project_manager?(User.current.id, @project.id) %>
-        <% if @request.state == "closed"  %>
-            该请求已被关闭
-        <% else %>
-            <div class="alert alert-orange mb15 ">
-              在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %></a>
-            </div>
-        <% end %>
-    <% end %>
+    <%= render "show_container" %>
 <% end %>
 
 

app/views/pull_requests/_show_container.html.erb

@@ -0,0 +1,15 @@
+<% if @request.state == "closed"  %>
+    <div class="alert alert-orange mb15 ">
+      该请求已被关闭
+    </div>
+<% elsif @commits_count == 0 %>
+    <div class="alert alert-orange mb15 ">
+      项目分支 <%= @request.source_branch %> 和 <%= @request.target_branch %> 似乎没有差异，请将新改动提交至源分支或者切换到其它目标分支
+    </div>
+<% else %>
+    <% if is_project_manager?(User.current.id, @project.id) %>
+        <div class="alert alert-orange mb15 ">
+          在管理员接受后，将由系统自动合并。<%= link_to "接受", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "linkBlue2", :remote => true %></a>
+        </div>
+    <% end %>
+<% end %>

app/views/versions/_issue_statistics.html.erb

@@ -9,21 +9,21 @@
   </tr>
   </thead>
   <tbody>
+  <tr>
+    <td>合计</td>
+    <td><%= Issue.where(:fixed_version_id => @version.id).count %> </td>
+    <td><%= Issue.where(:fixed_version_id => @version.id, :status_id => 3).count %></td>
+    <td><%= Issue.where(:fixed_version_id => @version.id, :status_id => 5).count %></td>
+    <td><%= Issue.where(fixed_version_id: @version.id, status_id: [1,2,4]).count %></td>
+  </tr>
   <% @version_issue_assigned_name.each do | assigned | %>
       <tr>
-        <td><%= User.find(assigned[0]).try(:show_name) %></td>
+        <td><%= User.find(assigned[0]).try(:show_name).nil? ? "未指派" : User.find(assigned[0]).try(:show_name) %></td>
         <td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0]).count %></td>
         <td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 3).count %></td>
         <td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 5).count %></td>
         <td><%= Issue.where(fixed_version_id: @version.id, assigned_to_id: assigned[0], status_id: [1,2,4]).count %></td>
       </tr>
   <% end %>
-  <tr>
-    <td>Total</td>
-    <td><%= Issue.where(:fixed_version_id => @version.id).count %> </td>
-    <td><%= Issue.where(:fixed_version_id => @version.id, :status_id => 3).count %></td>
-    <td><%= Issue.where(:fixed_version_id => @version.id, :status_id => 5).count %></td>
-    <td><%= Issue.where(fixed_version_id: @version.id, status_id: [1,2,4]).count %></td>
-  </tr>
   </tbody>
 </table>

app/views/versions/_new_milestone.html.erb

@@ -14,7 +14,7 @@
             <li class="mb10 clear">
               <label><span class="c_red f12">*</span>&nbsp;名称&nbsp;&nbsp;:&nbsp;</label>
               <%= f.text_field :name, :maxlength => 60, :class=>"w650", :style=>"height: 28px;", :id => "popub_setting_version_name", :no_label => true %>
-              <p class="c_orange ml100" style="display: none" id="pupub_project_setting_version_title">标题不能为空</p>
+              <p class="c_orange ml100" style=" margin-left:50px;display: none" id="pupub_project_setting_version_title">标题不能为空</p>
             </li>
             <li class="mb10 clear">
               <label class="ml5">&nbsp;描述&nbsp;&nbsp;:&nbsp;</label>

public/stylesheets/css/project.css

@@ -860,8 +860,8 @@ input.pro_newissue_con_check{ width: 15px; height: 15px;}
 .pro_new_top {padding-top:15px; border:1px solid #ddd; background-color:#fff;  width: 998px;}
 .icons_newpro_lock{width: 22px; height: 23px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -113px no-repeat;}
 .pro_new_name{width: 600px; }
-a.pro_new_username { font-size: 20px; color: #3b94d6; line-height: 24px; cursor: default;}
-a.pro_new_username_fork { font-size: 12px; color: #3b94d6; line-height: 24px; cursor: default;}
+a.pro_new_username { font-size: 20px; color: #3b94d6; line-height: 24px;}
+a.pro_new_username_fork { font-size: 12px; color: #3b94d6; line-height: 24px;}
 a.pro_new_proname{ overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;}
 a.pro_new_project_name{ width: 250px; overflow: hidden;white-space: nowrap;text-overflow:ellipsis;display: inline-block;}
 a.pro_new_topbtn{ padding: 3px 7px; font-size: 12px;  line-height: 20px; color: #333;vertical-align: middle;background-color: #fff; border: 1px solid #ddd;  border-left: 0; border-top-right-radius: 3px; border-bottom-right-radius: 3px; color: #333;}