From d38a301ca8af29ee33dacc623f43f01ef971db13 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 30 Sep 2017 16:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E8=AE=AD=E8=B7=AF=E5=BE=84=E5=A2=9E=E5=8A=A0=E2=80=9C=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E5=8F=91=E5=B8=83=E2=80=9D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb   | 5 +++++
 app/views/subjects/_subject_top.html.erb | 2 ++
 config/routes.rb                         | 1 +
 3 files changed, 8 insertions(+)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index 45575406f..528109a28 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -129,6 +129,11 @@ class SubjectsController < ApplicationController
     redirect_to subject_path(@subject)
   end
 
+  def cancel_has_publish
+    @subject.update_attributes(:status => 0)
+    redirect_to subject_path(@subject)
+  end
+
   def destroy
     if @subject
       ApplyAction.where(:container_type => "ApplySubject", :container_id => @subject.id).destroy_all
diff --git a/app/views/subjects/_subject_top.html.erb b/app/views/subjects/_subject_top.html.erb
index ce033d81c..3622c68dc 100644
--- a/app/views/subjects/_subject_top.html.erb
+++ b/app/views/subjects/_subject_top.html.erb
@@ -41,6 +41,8 @@
           <%= link_to '申请发布', publish_subject_path(@subject), :class => "course-btn fr", :remote => true %>
       <% elsif @subject.status == 1 && User.current.manager_of_subject?(@subject) %>
           <%= link_to '撤销申请', cancel_publish_subject_path(@subject), :class => "course-btn fr" %>
+      <% elsif @subject.status == 2 && User.current.manager_of_subject?(@subject) %>
+          <a href="javascript:void(0)" class="course-btn fr" onclick="s_op_confirm_box('<%= cancel_has_publish_subject_path(@subject) %>', '是否确认撤销发布<br/>确认后，回退到编辑状态')">撤销发布</a>
       <% end %>
     </div>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index e659931c4..09410cc58 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,6 +44,7 @@ RedmineApp::Application.routes.draw do
       get 'choose_subject_shixun'
       get 'publish'
       get 'cancel_publish'
+      get 'cancel_has_publish'
       post 'update_attr'
     end