From ff592c106ef7ee35eed99d9a558d3d2ce5bfe3f5 Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 14 Aug 2016 10:29:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?sonar=E6=9C=80=E6=96=B0=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/quality_analysis_controller.rb | 5 ----- app/helpers/quality_analysis_helper.rb | 5 +++++ app/views/quality_analysis/_result_list.html.erb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb index 228b643f5..a0b275dc7 100644 --- a/app/controllers/quality_analysis_controller.rb +++ b/app/controllers/quality_analysis_controller.rb @@ -33,11 +33,6 @@ class QualityAnalysisController < ApplicationController projects_date = open(@sonar_address + "/api/projects/index").read arr = JSON.parse(projects_date).map {|m| m["nm"]} # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"] quality_an = QualityAnalysis.where(:sonar_name => sonar_name).first - logger.info("###########################6666666666666") - logger.info("job_name is ###########################{job_name}") - logger.info("@client_jenkins is ###########################{@client_jenkins}") - logger.info("@client_jenkins job is ###########################{@client_jenkins.job}") - logger.info("@client_jenkins result is ###########################{@client_jenkins.job.exists?(job_name)}") if @client_jenkins.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank? aa = @client_jenkins.job.delete("#{job_name}") quality_an.delete unless quality_an.blank? diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb index dc7db673e..afafac3b1 100644 --- a/app/helpers/quality_analysis_helper.rb +++ b/app/helpers/quality_analysis_helper.rb @@ -1,6 +1,11 @@ # encoding: utf-8 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 + end + def sqale_rating_status val arr = [] if val <= 5 diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb index 8b7c26498..108e5c58e 100644 --- a/app/views/quality_analysis/_result_list.html.erb +++ b/app/views/quality_analysis/_result_list.html.erb @@ -21,7 +21,7 @@ - + <% if User.current.try(:login) == qa.author_login || User.current.admin? || is_project_manager?(User.current.id, @project.id) %> - + <% if User.current.try(:login) == qa.author_login || User.current.admin? || is_project_manager?(User.current.id, @project.id) %> - + <% if User.current.try(:login) == qa.author_login || User.current.admin? || is_project_manager?(User.current.id, @project.id) %>