From 7c28f9720877e58924b3942d8838b621866df9ba Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 14 Aug 2016 10:45:01 +0800
Subject: [PATCH 1/3] get quality analisys update time

---
 app/helpers/quality_analysis_helper.rb           | 2 +-
 app/views/quality_analysis/_result_list.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index afafac3b1..f7dbf3469 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -3,7 +3,7 @@ module QualityAnalysisHelper
 
   def sonar_time sonar_name
     sonar = open(@sonar_address + "/api/resources/index?resource=#{sonar_name}&depth=0").read
-    sonar =JSON.parse(sonar).first
+    sonar =JSON.parse(sonar).first['date']
   end
 
   def sqale_rating_status val
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 108e5c58e..990629385 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -21,7 +21,7 @@
           <li class="analysis-result-version fl fontBlue2 hidden" title="<%= qa.branch %>"><%= qa.branch %></li>
           <li class="analysis-result-loc fl fontBlue2 hidden" title="<%= qa.language %>"><%= qa.language %></li>
           <li class="analysis-result-debt fl fontBlue2 hidden" title="<%= qa.path %>"><%= qa.path %></li>
-          <li class="analysis-result-time fl fontBlue2 hidden" title="<%= qa.updated_at %>"><%= format_time(sonar_time(qa)) %></li>
+          <li class="analysis-result-time fl fontBlue2 hidden" title="<%= qa.updated_at %>"><%= format_time(sonar_time(qa.sonar_name)) %></li>
           <% if User.current.try(:login) == qa.author_login || User.current.admin? || is_project_manager?(User.current.id, @project.id) %>
             <li class="analysis-result-edit fl fontBlue2 hidden" title="<%= qa.path %>">
                 <%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true, :class => "fontBlue2" %><span style="color: #888"> / </span>

From d7177713ff5e6c9e06de517c207666b9a0c83ea1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 14 Aug 2016 11:16:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=B8=B8=E5=AE=A2?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=B8=B8=E5=AE=A2=E8=83=BD=E5=A4=9F=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2d5455b67..da66f249b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2172,7 +2172,7 @@ module ApplicationHelper
         candown = User.current.member_of_org?(org) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif attachment.container.is_a?(OrgDocumentComment)
         org = attachment.container.organization
-        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
+        candown = org.allow_guest_download || User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.course
         course = attachment.container.board.course

From 577aa40ea1408717053442a5cf8ffd4d7aa8e8db Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 14 Aug 2016 11:27:49 +0800
Subject: [PATCH 3/3] time for nil

---
 app/views/quality_analysis/_result_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 990629385..5b4e4f5a0 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -21,7 +21,7 @@
           <li class="analysis-result-version fl fontBlue2 hidden" title="<%= qa.branch %>"><%= qa.branch %></li>
           <li class="analysis-result-loc fl fontBlue2 hidden" title="<%= qa.language %>"><%= qa.language %></li>
           <li class="analysis-result-debt fl fontBlue2 hidden" title="<%= qa.path %>"><%= qa.path %></li>
-          <li class="analysis-result-time fl fontBlue2 hidden" title="<%= qa.updated_at %>"><%= format_time(sonar_time(qa.sonar_name)) %></li>
+          <li class="analysis-result-time fl fontBlue2 hidden" title="<%= sonar_time(qa.sonar_name).blank? ? qa.created_at : sonar_time(qa.sonar_name) %>"><%= format_time(sonar_time(qa.sonar_name).blank? ? qa.created_at : sonar_time(qa.sonar_name)) %></li>
           <% if User.current.try(:login) == qa.author_login || User.current.admin? || is_project_manager?(User.current.id, @project.id) %>
             <li class="analysis-result-edit fl fontBlue2 hidden" title="<%= qa.path %>">
                 <%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true, :class => "fontBlue2" %><span style="color: #888"> / </span>