diff --git a/app/views/student_work/_evaluation_un_group_title.html.erb b/app/views/student_work/_evaluation_un_group_title.html.erb
index 45756245..45060f94 100644
--- a/app/views/student_work/_evaluation_un_group_title.html.erb
+++ b/app/views/student_work/_evaluation_un_group_title.html.erb
@@ -50,11 +50,11 @@
<%= student_work.group_id == 0 ? '--' : '分组'+student_work.group_id.to_s %>
<% if @homework.homework_detail_group.base_on_project == 1 %>
-
+ |
<% if student_work.project %>
<% project = student_work.project %>
<% if project.status != 9 && (project.is_public || User.current.member_of?(project) || @is_teacher) %>
- <%= link_to project.name, project_path(project.id), :class => 'color-grey3 task-hide', :style => "max-width:120px;", :title => "项目名称", :target => "_blank" %>
+ <%= link_to project.name, project_path(project.id), :class => 'color-grey3 task-hide inlineblock', :style => "max-width:120px;", :title => "项目名称", :target => "_blank" %>
<% elsif project.status != 9 %>
<%= project.name %>
<% else %>
diff --git a/lib/tasks/homework_git_file.rake b/lib/tasks/homework_git_file.rake
index f8a5253a..f0102c37 100644
--- a/lib/tasks/homework_git_file.rake
+++ b/lib/tasks/homework_git_file.rake
@@ -12,11 +12,12 @@ namespace :homework do
end
task :gitfiledown => :environment do
- begin
+ # begin
puts ENV['args']
system("tmp/homework_file") if File.exist?("tmp/homework_file")
homework_common = HomeworkCommon.find(ENV['args'])
student_works = homework_common.student_works
+ g = Gitlab.client
student_works.each do |sw|
username = sw.user.try(:show_real_name)
myshixun = sw.try(:myshixun)
@@ -35,9 +36,9 @@ namespace :homework do
end
end
end
- rescue Exception => e
- Rails.logger.error(e.message)
- end
+ # rescue Exception => e
+ # Rails.logger.error(e.message)
+ # end
end
end
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 24d992c9..c550bac6 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3423,4 +3423,7 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
}
.width698{
width: 698px;
+}
+.inlineblock{
+ display:inline-block;
}
\ No newline at end of file
|