diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb index 2c55f780c..bec66aeff 100644 --- a/app/controllers/quality_analysis_controller.rb +++ b/app/controllers/quality_analysis_controller.rb @@ -165,6 +165,7 @@ class QualityAnalysisController < ApplicationController # resource_id: login + @repository.id def index begin + @branch = params[:branch] @resource_id = params[:resource_id] @sonar_address = Redmine::Configuration['sonar_address'] @jenkins_address = Redmine::Configuration['jenkins_address'] @@ -177,7 +178,7 @@ class QualityAnalysisController < ApplicationController else if params[:current_build_status] == "failure" 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 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 diff --git a/app/views/quality_analysis/_console_output.html.erb b/app/views/quality_analysis/_console_output.html.erb index 45115b9fe..372f7ec8d 100644 --- a/app/views/quality_analysis/_console_output.html.erb +++ b/app/views/quality_analysis/_console_output.html.erb @@ -2,7 +2,7 @@
- <%= h @console_build.to_json.html_safe %> -
++
<%= l(:label_tags_user_name) %><%= link_to ("#{user.name}"),
:controller => "users",:action => "show",:id => user.id%>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 947366eeb..038768a41 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -16,7 +16,7 @@
<% content_for :content do %>