diff --git a/.access_token b/.access_token
index 19fe1d90e..2e228963c 100644
--- a/.access_token
+++ b/.access_token
@@ -1 +1 @@
-{"access_token":"vEA6yE7AclWpSWvnRngP7PHl7t8xOexEJS73mWtpEYCCtT6otLnxGV71YQIACEChH5jTZteXhgeuqfbVNB_f0HOYyF0yZpVmiMHANI2BqFVyKqqDOppujvyzF7JHk6TMEGLfAFAHJO","expires_in":7200,"got_token_at":1467618773}
\ No newline at end of file
+{"access_token":"b_Pc60Dd5eyg_ut3cHbsjQO9EJJdj2Qj5F99o9LH9ltKSme7_FZ3Of22lWLL-K2V0siWzv-bd9PO0Dn-L1PBvIy9LhXa0qPVaFl6vTtZHR2kA8qjo1ps2ancya0t7KmzURGbAFAAXM","expires_in":7200,"got_token_at":1467976842}
\ No newline at end of file
diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 1d23c28c2..db5fac9c7 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/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}")
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a8df9ae6c..3f23d94dc 100644
--- a/app/controllers/users_controller.rb
+++ b/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
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4ebb8eb80..23fd401fd 100644
--- a/app/helpers/application_helper.rb
+++ b/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(/ /, ' ')
diff --git a/app/views/admin/_rename_course_name.html.erb b/app/views/admin/_rename_course_name.html.erb
new file mode 100644
index 000000000..8cc061c76
--- /dev/null
+++ b/app/views/admin/_rename_course_name.html.erb
@@ -0,0 +1,3 @@
+
+ <%= course.name %>
+
\ No newline at end of file
diff --git a/app/views/admin/syllabuses.html.erb b/app/views/admin/syllabuses.html.erb
index 1066ac3ef..782f6b01c 100644
--- a/app/views/admin/syllabuses.html.erb
+++ b/app/views/admin/syllabuses.html.erb
@@ -68,10 +68,8 @@
|
|
-
-
- <%= course.name%>
-
+ |
+ <%= render :partial => 'admin/rename_course_name', :locals => {:course => course} %>
|
<%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
diff --git a/app/views/admin/update_course_name.js.erb b/app/views/admin/update_course_name.js.erb
index 2da524b5b..45c0cb99d 100644
--- a/app/views/admin/update_course_name.js.erb
+++ b/app/views/admin/update_course_name.js.erb
@@ -1 +1 @@
-$("#rename_course_name_<%=@course.id %>").html("<%=@course.name %>");
\ No newline at end of file
+$("#syllabus_course_name_<%=@course.id %>").html("<%=escape_javascript(render :partial => 'admin/rename_course_name', :locals => {:course => @course}) %>");
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 3a2b17720..347f33cb5 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -78,27 +78,27 @@
<%= @ha["blocker_violations"].nil? ? 0 : @ha["blocker_violations"] %>
- %;">
+ %;">
+ %;">
+ %;">
+ %;">
+ %;">
diff --git a/config/menu.yml b/config/menu.yml
index 3a55966eb..053343094 100644
--- a/config/menu.yml
+++ b/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:
|