Merge remote-tracking branch 'origin/develop' into weixin_guange

.access_token

@@ -1 +1 @@
-{"access_token":"vEA6yE7AclWpSWvnRngP7PHl7t8xOexEJS73mWtpEYCCtT6otLnxGV71YQIACEChH5jTZteXhgeuqfbVNB_f0HOYyF0yZpVmiMHANI2BqFVyKqqDOppujvyzF7JHk6TMEGLfAFAHJO","expires_in":7200,"got_token_at":1467618773}
+{"access_token":"b_Pc60Dd5eyg_ut3cHbsjQO9EJJdj2Qj5F99o9LH9ltKSme7_FZ3Of22lWLL-K2V0siWzv-bd9PO0Dn-L1PBvIy9LhXa0qPVaFl6vTtZHR2kA8qjo1ps2ancya0t7KmzURGbAFAAXM","expires_in":7200,"got_token_at":1467976842}

app/controllers/quality_analysis_controller.rb

@@ -83,6 +83,9 @@ class QualityAnalysisController < ApplicationController
           end
         end
 
+        # sonar 缓冲，取数据
+        sleep(5)
+
         # 获取sonar output结果
         console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
         logger.info("@current_build_status is ==> #{@current_build_status}")

app/controllers/users_controller.rb

@@ -1046,11 +1046,12 @@ class UsersController < ApplicationController
           homework_detail_group.save if homework_detail_group
 
           if homework.homework_type != 3
-            unless homework.course.nil?
+            students = homework.course.student
+            if !homework.course.nil? && !students.empty?
               name = homework.name
               name_str = name + "的作品提交"
               str = ""
-              homework.course.student.each do |student|
+              students.each do |student|
                 if str != ""
                   str += ","
                 end

app/helpers/application_helper.rb

@@ -3282,7 +3282,7 @@ end
 
 def strip_html(text,len=0,endss="...")
   ss = ""
-  if text.length>0
+  if !text.nil? && text.length>0
     ss=text.gsub(/<\/?.*?>/, '').strip
     ss = ss.gsub(/&nbsp;/, ' ')
 

app/views/admin/_rename_course_name.html.erb

@@ -0,0 +1,3 @@
+<span>
+  <a title="<%= course.name %>" id="rename_course_name_<%= course.id %>" ondblclick="rename_course_name($(this),'<%=course.name %>','<%=course.id %>');"><%= course.name %></a>
+</span>

app/views/admin/syllabuses.html.erb

@@ -68,10 +68,8 @@
               </td>
               <td class="center">
               </td>
-              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>'>
-                <span>
-                  <a title="<%=course.name %>" id="rename_course_name_<%=course.id %>" ondblclick="rename_course_name($(this),'<%=course.name %>','<%=course.id %>');"><%= course.name%></a>
-                </span>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>' id="syllabus_course_name_<%=course.id %>">
+                <%= render :partial => 'admin/rename_course_name', :locals => {:course => course} %>
               </td>
               <td align="center">
                 <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>

app/views/admin/update_course_name.js.erb

@@ -1 +1 @@
-$("#rename_course_name_<%=@course.id %>").html("<%=@course.name %>");
+$("#syllabus_course_name_<%=@course.id %>").html("<%=escape_javascript(render :partial => 'admin/rename_course_name', :locals => {:course => @course}) %>");

app/views/quality_analysis/_show.html.erb

@@ -78,27 +78,27 @@
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=BLOCKER" class="fontBlue2 w70 pInline">
         <%= @ha["blocker_violations"].nil? ? 0 : @ha["blocker_violations"] %>
       </a>
-      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@ha["blocker_violations"].nil? ? 0 : statistics_result_percentage(@ha["blocker_violations"].to_i, 1000) %>%;"></span></span></div>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@ha["blocker_violations"].nil? ? 0 : statistics_result_percentage(@ha["blocker_violations"].to_i, 3000) %>%;"></span></span></div>
     <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=CRITICAL" class="fontBlue2 w70 pInline">
         <%= @ha["critical_violations"].nil? ? 0 : @ha["critical_violations"] %>
       </a>
-      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["critical_violations"].nil? ? 0 : statistics_result_percentage(@ha["critical_violations"].to_i, 1000) %>%;"></span></span></div>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["critical_violations"].nil? ? 0 : statistics_result_percentage(@ha["critical_violations"].to_i, 3000) %>%;"></span></span></div>
     <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MAJOR" class="fontBlue2 w70 pInline">
         <%= @ha["major_violations"].nil? ? 0 : @ha["major_violations"] %>
       </a>
-      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["major_violations"].nil? ? 0 : statistics_result_percentage(@ha["major_violations"].to_i, 1000) %>%;"></span></span></div>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["major_violations"].nil? ? 0 : statistics_result_percentage(@ha["major_violations"].to_i, 3000) %>%;"></span></span></div>
     <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MINOR" class="fontBlue2 w70 pInline">
         <%= @ha["minor_violations"].nil? ? 0 : @ha["minor_violations"] %>
       </a>
-      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["minor_violations"].nil? ? 0 : statistics_result_percentage(@ha["minor_violations"].to_i, 1000) %>%;"></span></span></div>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["minor_violations"].nil? ? 0 : statistics_result_percentage(@ha["minor_violations"].to_i, 3000) %>%;"></span></span></div>
     <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=INFO" class="fontBlue2 w70 pInline">
         <%= @ha["info_violations"].nil? ? 0 : @ha["info_violations"] %>
       </a>
-      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["info_violations"].nil? ? 0 : statistics_result_percentage(@ha["info_violations"].to_i, 200) %>%;"></span></span></div>
+      <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["info_violations"].nil? ? 0 : statistics_result_percentage(@ha["info_violations"].to_i, 3000) %>%;"></span></span></div>
   </div>
 </div>
 <div class="analysis-tag-wrap f16">

config/menu.yml

@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   name: "我的课程"
   sub_button: