From 5e0ee0426a6b56ee1f0fa557321fba690c367495 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 7 Jan 2016 17:23:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81=E7=9A=84?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=94=BE=E5=9C=A8=E6=89=A3=E5=88=86=E4=B8=8A?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_course_homework.html.erb | 8 ++++---- app/views/users/_course_homework.html.erb | 10 +++++----- app/views/users/_user_homework_detail.html.erb | 9 ++++----- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 6b6308a21..41e392b33 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -101,6 +101,10 @@
+
+ <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %> +
+
迟交扣分:<%= activity.late_penalty%>分 @@ -141,10 +145,6 @@ <% end %> <% end %>
-
- <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %> -
-
<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
<% projects = activity.student_work_projects.where("is_leader = 1") %> diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index f7eae22db..33b61923e 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -101,7 +101,11 @@
- +
+ <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %> +
+
+
迟交扣分:<%= activity.late_penalty%>分 @@ -142,10 +146,6 @@ <% end %> <% end %>
-
- <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %> -
-
<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
<% projects = activity.student_work_projects.where("is_leader = 1") %> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index d14e5517b..b644d562b 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -104,7 +104,10 @@
- +
+ <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %> +
+
迟交扣分:<%= homework_common.late_penalty%>分 @@ -145,10 +148,6 @@ <% end %> <% end %>
-
- <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %> -
-
<% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>
<% projects = homework_common.student_work_projects.where("is_leader = 1") %>