From c8178fc02370d7046ed474dd75cd3b5702a2444e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Jun 2016 09:59:21 +0800
Subject: [PATCH] allert

---
 app/controllers/quality_analysis_controller.rb    | 15 ++++++++++++++-
 app/views/quality_analysis/create.js.erb          |  2 +-
 app/views/repositories/_quality_analysis.html.erb |  4 ++--
 app/views/repositories/show.html.erb              |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index ceac41399..852277126 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -26,7 +26,7 @@ class QualityAnalysisController < ApplicationController
       unless @client.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
-        language = params[:language]
+        language = swith_language_type(params[:language])
         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
@@ -72,6 +72,19 @@ class QualityAnalysisController < ApplicationController
     # end
   end
 
+  # get language type
+  def swith_language_type language
+    if language = "c#"
+      "cs"
+    elsif language = "python"
+      "py"
+    elsif language = "c"
+      "c++"
+    else
+      language
+    end
+  end
+
   # resource_id: login + @repository.id
   def index
     begin
diff --git a/app/views/quality_analysis/create.js.erb b/app/views/quality_analysis/create.js.erb
index f6955106f..4bb632b43 100644
--- a/app/views/quality_analysis/create.js.erb
+++ b/app/views/quality_analysis/create.js.erb
@@ -1 +1 @@
-<% %>
\ No newline at end of file
+alert("dengdai")
\ No newline at end of file
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
index e0240c257..b6eb62124 100644
--- a/app/views/repositories/_quality_analysis.html.erb
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -1,6 +1,6 @@
 <div class="f16 fb fontBlue mb10">代码质量分析</div>
 <div>
-  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :id => 'quality_analyses_form') do %>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id, :remote => true), :id => 'quality_analyses_form') do %>
       <div class="ui form">
         <div class="mb10" style="margin-right:13px;">
           <textarea  id="path_description" name="path" rows="8" placeholder="目录相对于根目录,用半角逗号隔开。如:src/main/java,libs,res/script" style="height: 87px; resize:vertical;" class="analysis-option-box"></textarea>
@@ -12,7 +12,7 @@
         </div>
         <div class="mb10">
           <div>
-            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"]), :id => 'branch', :class => "analysis-option-box" %>
           </div>
         </div>
         <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_form').submit();hideModal()">提交</a></div>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 92769dbbe..b524e898f 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,9 +5,9 @@
       <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
       <%# 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? %>
-          <%= link_to "质量分析", quality_analysis_path(:id => @project.id), :remote => true, :class => "btn_zipdown fr" %>
-      <%# end %>
+      <% 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 %>
       <%# else %>
       <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %>