From 834e72b0f8452b98c7b5f2708220ec5776eb2199 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 11 Jul 2016 14:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E9=85=8D=E7=BD=AE=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8A=A5500=EF=BC=8C=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=97=E8=A1=A8=E6=98=8E=E7=8F=AD=E7=BA=A7=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B7=B2=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb            | 4 ++--
 app/views/admin/_courselist_detail_tr.html.erb | 4 +++-
 app/views/admin/courses.html.erb               | 9 +++++++--
 app/views/admin/non_syllabus_courses.html.erb  | 4 +++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index bc764d034..be622b919 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -112,10 +112,10 @@ class AdminController < ApplicationController
   def non_syllabus_courses
     @name = params[:name].to_s.strip.downcase
     if @name && @name != ""
-      @courses = Course.where("syllabus_id is null").select{ |course| (course.teacher[:lastname].to_s.downcase + course.teacher[:firstname].to_s.downcase).include?(@name) || course.name.include?(@name)}
+      @courses = Course.where("syllabus_id is null and is_delete = 0").select{ |course| (course.teacher[:lastname].to_s.downcase + course.teacher[:firstname].to_s.downcase).include?(@name) || course.name.include?(@name)}
       @courses = @courses.sort{|x, y| y.created_at <=> x.created_at}
     else
-      @courses = Course.where("syllabus_id is null").order('created_at desc')
+      @courses = Course.where("syllabus_id is null and is_delete = 0").order('created_at desc')
     end
     @courses = paginateHelper @courses,30
     @page = (params['page'] || 1).to_i - 1
diff --git a/app/views/admin/_courselist_detail_tr.html.erb b/app/views/admin/_courselist_detail_tr.html.erb
index 07486faa3..bc1eebeed 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.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+  <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
 </td>
 <td align="center">
   <%= course.class_period %>
@@ -16,6 +16,8 @@
   <%= checked_image course.is_public? %>
 </td>
 <td class="center">
+  <%= course.is_delete == 0 ? '正常' : '归档' %>
+</td><td class="center">
   <%= format_date(course.created_at) %>
 </td>
 <td class="center">
diff --git a/app/views/admin/courses.html.erb b/app/views/admin/courses.html.erb
index 11fb1973f..8695bc6b9 100644
--- a/app/views/admin/courses.html.erb
+++ b/app/views/admin/courses.html.erb
@@ -27,10 +27,10 @@
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>
     <tr>
-      <th style="width: 30px;">
+      <th style="width: 20px;">
         序号
       </th>
-      <th style="width: 85px;">
+      <th style="width: 70px;">
         班级
       </th>
       <th style="width: 35px;">
@@ -42,6 +42,9 @@
       <th style="width: 15px;">
         <%=l(:field_is_public)%>
       </th>
+      <th style="width: 20px;">
+        状态
+      </th>
       <th style="width: 45px;">
         <%=l(:field_created_on)%>
       </th>
@@ -58,9 +61,11 @@
     </thead>
     <tbody>
     <% @courses.each do |course| %>
+        <% unless course.teacher.nil? %>
         <tr class="<%= cycle("odd", "even") %>" id="course_<%=course.id %>">
           <%=render :partial => 'courselist_detail_tr', :locals => {:course => course} %>
         </tr>
+        <% end %>
     <% end %>
     </tbody>
   </table>
diff --git a/app/views/admin/non_syllabus_courses.html.erb b/app/views/admin/non_syllabus_courses.html.erb
index 6c3cbec10..6cde56675 100644
--- a/app/views/admin/non_syllabus_courses.html.erb
+++ b/app/views/admin/non_syllabus_courses.html.erb
@@ -58,6 +58,7 @@
     </thead>
     <tbody>
     <% @courses.each do |course| %>
+        <% unless course.teacher.nil? %>
         <tr class="<%= cycle("odd", "even") %>" id="course_<%=course.id %>">
           <td style="text-align: center;">
             <%= course.id %>
@@ -68,7 +69,7 @@
             </span>
           </td>
           <td align="center">
-            <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+            <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
           </td>
           <td align="center">
             <%= course.class_period %>
@@ -90,6 +91,7 @@
           </td>
         </tr>
     <% end %>
+    <% end %>
     </tbody>
   </table>
 </div>