diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index 0393206b7..a7d804321 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -17,6 +17,7 @@ class ZipdownController < ApplicationController @project = obj.courses[0] end end + def assort obj_class = params[:obj_class] obj_id = params[:obj_id] @@ -76,18 +77,18 @@ class ZipdownController < ApplicationController homeattaches = bid.homeworks #记录所有作业是不是有附件,有一个附件就改为true - has_file = false + #has_file = false # 得到每一个人所有文件打包的zip文件 # 并将每一个人的zip打包为一个并返回路径 user_zip_paths = homeattaches.map do |homeattach| if homeattach.attachments.count > 0 zip_homework_by_user homeattach - has_file = true unless has_file + #has_file = true unless has_file end end - unless has_file - render file: 'public/no_file_fond.html' , :layout => 'course_base' - end + #unless has_file + # render file: 'public/no_file_fond.html' , :layout => 'course_base' + #end zipping "#{Time.now.to_i}_#{bid.name}.zip", user_zip_paths, OUTPUT_FOLDER #@paths = homeworks_attach_path diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb index 4a76a42ef..c70196a2f 100644 --- a/app/views/admin/users.html.erb +++ b/app/views/admin/users.html.erb @@ -26,7 +26,7 @@  
- +
<%= sort_header_tag('login', :caption => l(:field_login)) %> diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 3ed809fe0..0326f218c 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -78,7 +78,7 @@ <% end %> diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb index 8b0bb1f8b..83fb857f4 100644 --- a/app/views/tags/_show_attachments.html.erb +++ b/app/views/tags/_show_attachments.html.erb @@ -4,7 +4,7 @@
<% attachments_results.each do |file| %>

-

- <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> + <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %> 迟交 <% end %>
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 50dc9393d..d7bf08fb5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1389,7 +1389,7 @@ a.toggle-all:hover {text-decoration:none;} table.list tbody tr:hover { background-color:#ffffdd; } table.list tbody tr.group:hover { background-color:inherit; } -table td {padding:2px;} +table td {padding:2px;word-break: break-all;word-wrap: break-word;} table p {margin:0;} .odd {background-color:#f6f7f8;} .even {background-color: #fff;}