jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'rep_quality' into develop

This commit is contained in:
huang 2016-07-01 21:34:49 +08:00
parent 62a7d56c97 6ac7d322b9
commit d346679eaf
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/quality_analysis_controller.rb
View File

@ -165,6 +165,7 @@ class QualityAnalysisController < ApplicationController
# resource_id: login + @repository.id # resource_id: login + @repository.id
def index def index
begin begin
@branch = params[:branch]
@resource_id = params[:resource_id] @resource_id = params[:resource_id]
@sonar_address = Redmine::Configuration['sonar_address'] @sonar_address = Redmine::Configuration['sonar_address']
@jenkins_address = Redmine::Configuration['jenkins_address'] @jenkins_address = Redmine::Configuration['jenkins_address']
@ -177,7 +178,7 @@ class QualityAnalysisController < ApplicationController
else else
if params[:current_build_status] == "failure" if params[:current_build_status] == "failure"
job_name = params[:job_name] job_name = params[:job_name]
@console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text') @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
end end
complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
@complexity =JSON.parse(complexity_date).first @complexity =JSON.parse(complexity_date).first

6
app/views/quality_analysis/_console_output.html.erb
View File

@ -2,7 +2,7 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2" style="width:180px;">质量分析</h2> <h2 class="project_h2" style="width:180px;">质量分析</h2>
</div> </div>
<p> <div>
<%= h @console_build.to_json.html_safe %> <%=h @console_build %>
</p> </div>

2
app/views/quality_analysis/index.html.erb
View File

@ -2,7 +2,7 @@
<%= render :partial => "result_list" %> <%= render :partial => "result_list" %>
<% else %> <% else %>
<% if params[:current_build_status].nil? || params[:current_build_status] == "success" %> <% if params[:current_build_status].nil? || params[:current_build_status] == "success" %>
<%= render :partial => "show", :locals => {:branch => params[:branch]} %> <%= render :partial => "show", :locals => {:branch => @branch} %>
<% else %> <% else %>
<% if params[:build_console_result] %> <% if params[:build_console_result] %>
运行结果超时 运行结果超时