From 22b40c082cd71de2873af3136437908a10f8d1af Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 29 Jun 2016 09:10:47 +0800 Subject: [PATCH] resole some nil problems --- .../quality_analysis_controller.rb | 2 +- .../quality_analysis/_hightchars.html.erb | 6 +- app/views/quality_analysis/_show.html.erb | 94 +++++++++++-------- app/views/repositories/show.html.erb | 4 +- 4 files changed, 62 insertions(+), 44 deletions(-) diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb index 7b0bc5327..9ea602659 100644 --- a/app/controllers/quality_analysis_controller.rb +++ b/app/controllers/quality_analysis_controller.rb @@ -27,7 +27,7 @@ class QualityAnalysisController < ApplicationController @g = Gitlab.client branch = params[:branch] language = params[:language] - path = params[:path].nil? ? "./" :params[:path] + path = params[:path].blank? ? "./" : params[:path] qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first version = qa.nil? ? 1 : qa.sonar_version + 1 properties = "sonar.projectKey=#{sonar_name} diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb index fb60eaed3..278851ad5 100644 --- a/app/views/quality_analysis/_hightchars.html.erb +++ b/app/views/quality_analysis/_hightchars.html.erb @@ -209,7 +209,7 @@ }, series: [{ name: '复杂度', - data: [<%= @complexity["msr"][6]["val"] %>] + data: [<%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %>] // tooltip: { // valueSuffix: ' km/h' // } @@ -329,7 +329,7 @@ }, series: [{ name: '重复率', - data: [<%= @complexity["msr"][7]["val"] %>] + data: [<%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["val"] %>] // tooltip: { // valueSuffix: ' km/h' // } @@ -454,7 +454,7 @@ }, series: [{ name: '质量等级', - data: [<%= @complexity["msr"][5]["val"] %>] + data: [<%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["val"] %>] // tooltip: { // valueSuffix: ' km/h' // } diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb index 4f8c21fe3..0a522df52 100644 --- a/app/views/quality_analysis/_show.html.erb +++ b/app/views/quality_analysis/_show.html.erb @@ -1,5 +1,4 @@ <%= javascript_include_tag 'highcharts','highcharts-more' %> -<%= render :partial => "hightchars" %>

质量分析

@@ -7,66 +6,85 @@
项目代码质量分析报告
概要信息
-
-
-
-

-

质量等级

-

<%= @complexity["msr"][9]["frmt_val"] %> borderRadius"><%= sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %>

+<% if @complexity["msr"].count > 3 %> + <%= render :partial => "hightchars" %> +
+
+
+

+

质量等级

+

<%= @complexity["msr"][9].nil? ? 0 : @complexity["msr"][9]["frmt_val"] %> + borderRadius"><%= @complexity["msr"][9].nil? ? 0 : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %>

+
+
+

+

复杂度

+

<%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %> + borderRadius"><%= @complexity["msr"][6].nil? ? 0 : complexity_status(@complexity["msr"][6]["val"].to_i)[0] %>

+
-
-

-

复杂度

-

<%= @complexity["msr"][6]["val"] %> borderRadius"><%= complexity_status(@complexity["msr"][6]["val"].to_i)[0] %>

+
+
+

+

代码重复度

+

<%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["frmt_val"] %> + borderRadius"><%= @complexity["msr"][7].nil? ? 0 : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %>

+
+
+

+

注释率

+

<%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["frmt_val"] %> + borderRadius"><%= @complexity["msr"][5].nil? ? 0 : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %>

+
-
-
-

-

代码重复度

-

<%= @complexity["msr"][7]["frmt_val"] %> borderRadius"><%= duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %>

-
-
-

-

注释率

-

<%= @complexity["msr"][5]["frmt_val"] %> borderRadius"><%=comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %>

-
-
-
-
质量等级<%= score_sqale_rating(@complexity["msr"][9]["val"].to_i) %>/5分可定性评价为：质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %>
+<% end %> + +
质量等级<%=@complexity["msr"][9].nil? ? 0 : score_sqale_rating(@complexity["msr"][9]["val"].to_i) %>/5分 + 可定性评价为：质量<%=@complexity["msr"][9].nil? ? 0 : sqale_rating_status(@complexity["msr"][9]["val"])[0] %>
-
技术债务<%= @complexity["msr"][8]["frmt_val"] %>查看详情
+
技术债务<%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %> + 查看详情
质量问题 - <%= @sonar_issues["msr"][0]["frmt_val"] %>问题分类如下：
+ <%=@sonar_issues["msr"][0].nil? ? 0 : @sonar_issues["msr"][0]["frmt_val"] %>问题分类如下：
-
阻断<%= @sonar_issues["msr"][1]["frmt_val"] %>%;">
-
严重<%= @sonar_issues["msr"][2]["frmt_val"] %>%;">
-
主要<%= @sonar_issues["msr"][3]["frmt_val"] %>%;">
-
次要<%= @sonar_issues["msr"][4]["frmt_val"] %>%;">
-
信息<%= @sonar_issues["msr"][5]["frmt_val"] %>%;">
+
阻断 + <%= @sonar_issues["msr"][1].nil? ? 0 : @sonar_issues["msr"][1]["frmt_val"] %> + %;">
+
严重 + <%= @sonar_issues["msr"][2].nil? ? 0 : @sonar_issues["msr"][2]["frmt_val"] %> + %;">
+
主要 + <%= @sonar_issues["msr"][3].nil? ? 0 : @sonar_issues["msr"][3]["frmt_val"] %> + %;">
+
次要 + <%=@sonar_issues["msr"][4].nil? ? 0 : @sonar_issues["msr"][4]["frmt_val"] %> + %;">
+
信息 + <%=@sonar_issues["msr"][5].nil? ? 0 : @sonar_issues["msr"][5]["frmt_val"] %>%;">
-
代码规模可定性评价为：<%= lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %>
+
代码规模可定性评价为：<%=@complexity["msr"][0].nil? ? 0 : lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %>

代码行数

-

<%= @complexity["msr"][0]["frmt_val"] %>

+

<%= @complexity["msr"][0].nil? ? 0 : @complexity["msr"][0]["frmt_val"] %>

文件

-

<%= @complexity["msr"][2]["frmt_val"] %>

+

<%= @complexity["msr"][2].nil? ? 0 : @complexity["msr"][2]["frmt_val"] %>

目录

-

<%= @complexity["msr"][3]["frmt_val"] %>

+

<%= @complexity["msr"][3].nil? ? 0 : @complexity["msr"][3]["frmt_val"] %>

类

-

<%= @complexity["msr"][1]["frmt_val"] %>

+

<%= @complexity["msr"][1].nil? ? 0 : @complexity["msr"][1]["frmt_val"] %>

方法

-

<%= @complexity["msr"][4]["frmt_val"] %>

+

<%=@complexity["msr"][4].nil? ? 0 : @complexity["msr"][4]["frmt_val"] %>

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 0f179d150..92769dbbe 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -5,9 +5,9 @@ ZIP下载 <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %> <%# if User.current.member_of?(@project) %> - <% if quality_analysis(User.current.try(:login), @repository.id).nil? %> + <%# if quality_analysis(User.current.try(:login), @repository.id).nil? %> <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %> - <% end %> + <%# end %> <%# end %> <%# else %> <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>