From d9f312bbe3574a352fd8f473ef81421cbb9a7701 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Jul 2015 09:56:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BD=93=E4=BD=9C=E5=93=81=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8A=A5=E9=94=99=202=E3=80=81=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E4=BD=9C=E5=93=81=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=EF=BC=9AXX=E7=9A=84=E4=BD=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_student_work.html.erb | 3 ++-
 app/views/student_work/_evaluation_work.html.erb         | 3 ++-
 app/views/student_work/_show.html.erb                    | 2 +-
 app/views/student_work/_student_work.html.erb            | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/student_work/_evaluation_student_work.html.erb b/app/views/student_work/_evaluation_student_work.html.erb
index b5bdd6f55..9569718fb 100644
--- a/app/views/student_work/_evaluation_student_work.html.erb
+++ b/app/views/student_work/_evaluation_student_work.html.erb
@@ -9,7 +9,8 @@
     <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
   </li>
   <li class=" hwork_tit">
-    <%= link_to student_work.name, student_work_path(student_work.id),:remote => true,:title => student_work.name, :class => "c_blue02"%>
+    <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+    <%= link_to student_work_name, student_work_path(student_work.id),:remote => true,:title => student_work.name, :class => "c_blue02"%>
   </li>
   <li class=" hwork_time_c">
     <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 11ce7b080..be07269c3 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -18,7 +18,8 @@
     <% end%>
   </li>
   <li class=" hwork_tit_e" style="width: 410px">
-    <%= link_to student_work.name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
+    <% student_work_name = student_work.name.nil? || student_work.name.empty? ? '匿名的作品' : student_work.name%>
+    <%= link_to student_work_name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
   </li>
   <% my_score = student_work_score(student_work,User.current) %>
   <li class=" hwork_code <%= my_score.nil? ? 'c_grey' : 'c_red'%>">
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index 2b7d49402..f6580659e 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -36,7 +36,7 @@
   <li >
     <span class="tit_fb ">内容：</span>
     <div class="show_hwork_p break_word">
-      <%= text_format @work.description%>
+      <%= text_format(@work.description) if @work.description%>
     </div>
     <div class="cl"></div>
   </li>
diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb
index dd7ab7e2d..f7eb7514d 100644
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@@ -9,7 +9,8 @@
     <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
   </li>
   <li class=" hwork_tit_une">
-    <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
+    <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+    <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
   </li>
   <li class=" hwork_time_c">
     <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>