From 4f7f4acb1fa9d4d4e0f45f1ddf34fec017d224ba Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Dec 2015 17:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb    | 5 +++++
 app/views/courses/settings.html.erb      | 6 ++++++
 app/views/layouts/new_base_user.html.erb | 2 +-
 config/routes.rb                         | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 5109e15f4..909c13db8 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -634,6 +634,11 @@ class CoursesController < ApplicationController
   end
 
   def show
+    # 被删除的课程只有超级管理员才能看到，is_delete为1的时候，标记课程被删除
+    if @course.is_delete == 1 && User.current.admin?
+      render_403
+      return
+    end
     #更新创建课程消息状态
     create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
     create_course_messages.update_all(:viewed => true)
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 3456634d5..173d2de4a 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -88,6 +88,12 @@
           </li>
       <% end %>
     </ul>
+    <% if @course.is_delete == 1 %>
+        <div class="mt30 fr"><img src="/images/pic_del.gif" class="mr5"><%=link_to "恢复该课程", course_path(@course), :method => :delete %></div>
+    <% else %>
+        <div class="mt30 fr"><img src="/images/pic_del.gif" class="mr5"><%=link_to "删除该课程", course_path(@course), :method => :delete %></div>
+    <% end %>
+
   </div>
 
   <div class="hwork_undis" id="tbc_02">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 00d15fad0..b77c5b875 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -147,7 +147,7 @@
               <% end%>
           <% end%>
         </div>
-        <% courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
+        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
           <ul>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
diff --git a/config/routes.rb b/config/routes.rb
index 15e41955d..d242edd22 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -890,6 +890,7 @@ RedmineApp::Application.routes.draw do
       get 'member_score', :to => 'courses#member_score'
       post 'finishcourse'
       post 'restartcourse'
+      match "recover", :to => 'courses#recovery'
       match "searchmembers", :controller => 'courses', :action => 'searchmembers', :via => [:post,:get]
       match "searchgroupmembers", :via => [:post, :get]
       match 'member_score_sort', :via => [:get]