diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb index e9b5c5e4f..b14f024d7 100644 --- a/app/controllers/quality_analysis_controller.rb +++ b/app/controllers/quality_analysis_controller.rb @@ -48,6 +48,7 @@ class QualityAnalysisController < ApplicationController @g.add_project_hook(@project.gpid, jenkins_address + "/project/#{user_name}_#{identifier}") if qa.nil? QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier, :sonar_version => version, :path => path, :branch => branch, :language => language) + else qa.update_attribute(:sonar_version, version) end @@ -58,8 +59,16 @@ class QualityAnalysisController < ApplicationController if params[:resource_id].nil? @name_flag = true @quality_analyses = QualityAnalysis.where(:project_id => @project.id) + # @quality_analyses.map {|qa| qa.} + # if @quality_analyses.count > 0 + # @quality_analyses.each do |qa| + # ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"] + # + # end + # end # projects_date = open(@sonar_address + "/api/projects/index").read - # @results = JSON.parse(projects_date) + # arr = JSON.parse(projects_date).map {|m| m["nm"]} + # arr.map else @name_flag = false @resource_id = params[:resource_id] diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb index 6cc575b59..229be9826 100644 --- a/app/models/quality_analysis.rb +++ b/app/models/quality_analysis.rb @@ -1,3 +1,7 @@ class QualityAnalysis < ActiveRecord::Base attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language + + def user_rep_name + self.author_login+":"+self.rep_identifier + end end diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb index a674d143b..507ded0fe 100644 --- a/app/views/quality_analysis/_result_list.html.erb +++ b/app/views/quality_analysis/_result_list.html.erb @@ -1,16 +1,16 @@

分析结果

+ <% if @quality_analyses.count >0 %> <% @quality_analyses.each do |qa| %> -