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

app/controllers/application_controller.rb

@@ -701,7 +701,7 @@ class ApplicationController < ActionController::Base
       sheet1[count_row,2] = issue.subject
       sheet1[count_row,3] = issue.description
       sheet1[count_row,4] = issue_status_change(issue.status_id)
-      sheet1[count_row,5] = issue.assigned_to.show_name
+      sheet1[count_row,5] = issue.assigned_to.try(:show_name)
       sheet1[count_row,6] = issue_priority_change(issue.priority_id)
       sheet1[count_row,7] = issue.author.show_name
       sheet1[count_row,8] = issue.created_on

app/controllers/issues_controller.rb

@@ -86,11 +86,7 @@ class IssuesController < ApplicationController
       # @issue_pages = Paginator.new @issue_count, @limit, params['page']
       # params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1
       # @offset ||= @issue_pages.offset
-      @issues_filter = @query.issues
-      # (:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-      #                         :order => 'issues.updated_on desc',
-      #                         :offset => @offset,
-      #                         :limit => @limit)
+      @issues_filter = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version], :order => 'issues.updated_on desc')
       @limit = 10
       @is_remote = true
       @issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1
@@ -109,7 +105,7 @@ class IssuesController < ApplicationController
         format.csv  { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') }
         format.pdf  { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') }
         format.xls {filename = "#{@project.name.to_s}_#{l(:label_issue_list_xls)}.xls"
-                    send_data(issue_list_xls(@issues), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
+                    send_data(issue_list_xls(@issues_filter), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
         }
       end
     else

app/helpers/application_helper.rb

@@ -1799,7 +1799,7 @@ module ApplicationHelper
   end
 
   def link_to_function(name, function, html_options={})
-    content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(:class => " c_purple"))
+    content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(:class => "BlueCirBtnMini ml10",:style => "display:inline-block; height:20px; line-height:20px;"))
   end
 
   # Helper to render JSON in views

app/views/gantts/show.html.erb

@@ -22,7 +22,7 @@
         <td>
           <fieldset>
             <legend><%= l(:label_related_issues) %></legend>
-            <label>
+            <label style="padding:10px;">
               <%= check_box_tag "draw_rels", params["draw_rels"], params[:set_filter].blank? || params[:draw_rels] %>
               <% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
               <% rels.each do |rel| %>
@@ -37,7 +37,7 @@
         <td>
           <fieldset>
             <legend><%= l(:label_gantt_progress_line) %></legend>
-            <label>
+            <label style="padding:10px;">
               <%= check_box_tag "draw_progress_line", params[:draw_progress_line], params[:draw_progress_line] %>
               <%= l(:label_display) %>
             </label>

app/views/issues/_attributes.html.erb

@@ -25,6 +25,14 @@
           </li>
           <div class="cl"></div>
           <li>
+            <label class="label">来源：</label>
+            <select class="w150">
+              <option>客户</option>
+              <option>用户</option>
+              <option>其他</option>
+            </select>
+          </li>
+          <div class="cl"></div>
           <li>
             <label class="label"><%= l(:field_assigned_to) %>：</label>
             <% if @issue.safe_attribute? 'assigned_to_id' %>
@@ -74,7 +82,13 @@
             <label class="label02"><%= l(:field_estimated_hours) %>：</label>
             <% if @issue.safe_attribute? 'estimated_hours' %>
                 <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('estimated_hours') %>
-                <span class="mt3 ml5"><%= l(:field_hours) %></span>
+            <% end %>
+          </li>
+          <div class="cl"></div>
+          <li>
+            <label class="label02">实际工时 (H)：</label>
+            <% if @issue.safe_attribute? 'estimated_hours' %>
+                <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true %>
             <% end %>
           </li>
           <div class="cl"></div>

app/views/issues/_form.html.erb

@@ -18,6 +18,10 @@
               <label class="fl ml5 mt3" for="issue_is_private" id="issue_is_private_tips"><%= l(:field_is_private_tips)%></label>
           <% end %>
         </li>
+        <li>
+              <input type="checkbox" class="ml30">
+              <label class="fl ml5 mt3">不需要评审</label>
+        </li>
         <div class="cl"></div>
         <!--<li>-->
         <!--<%# if @issue.safe_attribute? 'project_id' %>-->

config/locales/projects/zh.yml

@@ -232,7 +232,7 @@ zh:
   field_closed_on: 已关闭
   field_start_date: 开始日期
   field_due_date: 计划完成日期
-  field_estimated_hours: 预期时间
+  field_estimated_hours: 预计工时 (H)
   field_assigned_to: 指派给
   field_priority: 优先级
   field_done_ratio: "% 完成"

public/stylesheets/css/common.css

@@ -542,15 +542,13 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .button-rep { color: #888;display: inline-block;background: #eee;padding: 2px 5px;}
-a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .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;}
 a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; 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.BlueCirBtn{ background:#3598db; color:#fff;}
-a.BlueCirBtnMini{ display:block;width:40px; 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.BlueCirBtnMini{ display:block;width:40px; height:24px; 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.BlueCirBtnMini{ background:#3598db; color:#fff;}
 
 /*20160725 项目申请按钮*/