From b3d34d6e0fc0c3361136ec71beff366d3e914aea Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 29 Jul 2016 20:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8F=AD=E7=BA=A7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb                | 2 ++
 app/views/admin/_courselist_detail_tr.html.erb | 2 +-
 app/views/admin/non_syllabus_courses.html.erb  | 2 +-
 app/views/admin/syllabuses.html.erb            | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index fd3aa6ebf..48a4a560c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -397,6 +397,8 @@ class CoursesService
     if course
       if course_endTime_timeout? course
         @state = 2
+      elsif course[:is_delete] == 1
+        @state = 11
       else
         if current_user.member_of_course?(course) #如果已经是成员
           @state = 3
diff --git a/app/views/admin/_courselist_detail_tr.html.erb b/app/views/admin/_courselist_detail_tr.html.erb
index 83b7904ce..6bec90845 100644
--- a/app/views/admin/_courselist_detail_tr.html.erb
+++ b/app/views/admin/_courselist_detail_tr.html.erb
@@ -7,7 +7,7 @@
             </span>
 </td>
 <td align="center">
-  <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+  <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
 </td>
 <td align="center">
   <%= course.class_period %>
diff --git a/app/views/admin/non_syllabus_courses.html.erb b/app/views/admin/non_syllabus_courses.html.erb
index 1be979eeb..c5a2c81ec 100644
--- a/app/views/admin/non_syllabus_courses.html.erb
+++ b/app/views/admin/non_syllabus_courses.html.erb
@@ -72,7 +72,7 @@
             </span>
           </td>
           <td align="center">
-            <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+            <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
           </td>
           <td align="center">
             <%= course.class_period %>
diff --git a/app/views/admin/syllabuses.html.erb b/app/views/admin/syllabuses.html.erb
index 194091abc..5098131da 100644
--- a/app/views/admin/syllabuses.html.erb
+++ b/app/views/admin/syllabuses.html.erb
@@ -52,7 +52,7 @@
           <td class="center">
           </td>
           <td align="center">
-            <%= link_to(syllabus.try(:user).try(:realname).truncate(6, omission: '...'), user_path(syllabus.user)) %>
+            <%= link_to syllabus.user.show_name, user_path(syllabus.user) %>
           </td>
           <td class="center">
             <%= format_date(syllabus.created_at) %>
@@ -70,7 +70,7 @@
                 <%= render :partial => 'admin/rename_course_name', :locals => {:course => course} %>
               </td>
               <td align="center">
-                <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+                <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
               </td>
               <td class="center">
                 <%= format_date(course.created_at) %>