diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb index c53e1939a..79bb733e8 100644 --- a/app/controllers/quality_analysis_controller.rb +++ b/app/controllers/quality_analysis_controller.rb @@ -74,7 +74,7 @@ class QualityAnalysisController < ApplicationController for i in 0..60 do sleep(30) @current_build_status = @client.job.get_current_build_status("#{job_name}") - if (@current_build_status != "not_run" || @current_build_status != "running") + if (@current_build_status == "success" || @current_build_status == "failure") break if i == 60 @build_console_result = false diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb index 3adea5c72..2442299bd 100644 --- a/app/views/quality_analysis/_show.html.erb +++ b/app/views/quality_analysis/_show.html.erb @@ -14,13 +14,13 @@
质量等级
<%= @complexity["msr"][9].nil? ? "A" : @complexity["msr"][9]["frmt_val"] %> -
+复杂度
<%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %> -
+代码重复度
<%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["frmt_val"] %> -
+注释率
<%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["frmt_val"] %> -
+