From 97b303fa99a76f7c2aa62e7beb353fcfa970cb8b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 20 Jul 2017 14:17:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=88=91=E7=9A=84=E9=A2=98=E5=BA=93?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E8=AE=BE=E4=B8=BA=E5=85=AC?=
 =?UTF-8?q?=E5=BC=80=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E5=90=8E?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_bank_controller.rb          | 7 +++++--
 app/views/homework_bank/_homework_bank_list.html.erb | 5 +++++
 app/views/homework_bank/index.html.erb               | 2 +-
 app/views/homework_bank/set_public.js.erb            | 2 ++
 app/views/homework_bank/show.html.erb                | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 app/views/homework_bank/set_public.js.erb

diff --git a/app/controllers/homework_bank_controller.rb b/app/controllers/homework_bank_controller.rb
index f1101d86e..2f62ffdc3 100644
--- a/app/controllers/homework_bank_controller.rb
+++ b/app/controllers/homework_bank_controller.rb
@@ -1,6 +1,6 @@
 class HomeworkBankController < ApplicationController
   before_filter :require_login, :only => [:index, :show, :new, :create, :edit, :update, :destroy, :destroy_all, :choose_user_course, :send_h_bank_to_course]
-  before_filter :find_homework_bank, :only => [:show, :edit, :update, :destroy]
+  before_filter :find_homework_bank, :only => [:show, :edit, :update, :destroy, :set_public]
 
   def index
     @order,@b_sort = params[:order] || "updated_at",params[:sort] || "desc"
@@ -221,7 +221,10 @@ class HomeworkBankController < ApplicationController
 
   def set_public
     @homework.update_attributes(:is_public => true)
-    redirect_to homework_bank_index_path()
+    respond_to do |format|
+      format.html{ redirect_to homework_bank_path(@homework) }
+      format.js
+    end
   end
 
   private
diff --git a/app/views/homework_bank/_homework_bank_list.html.erb b/app/views/homework_bank/_homework_bank_list.html.erb
index 807ee0205..6f148ccde 100644
--- a/app/views/homework_bank/_homework_bank_list.html.erb
+++ b/app/views/homework_bank/_homework_bank_list.html.erb
@@ -53,6 +53,11 @@
                 <ul class="edu-position-hide undis">
                   <li><%= link_to '预览', homework_bank_path(homework), :target => '_blank' %></li>
                   <li><%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{homework.id}"]), :remote => true %></li>
+                  <% unless homework.is_public %>
+                      <li id="set_homework_public_<%= homework.id %>">
+                        <a href="javascript:void(0);" onclick="delete_confirm_box('<%= set_public_homework_bank_path(homework) %>', '您确定要公开吗？<br/>公开后不能重设为私有')">设为公开</a>
+                      </li>
+                  <% end %>
                   <% if @type.to_i == 1 %>
                       <li><a href="javascript:void(0)" onclick="delete_confirm_box_3('<%= homework_bank_path(homework) %>', '确定要删除该题吗？')">删除</a></li>
                   <% end %>
diff --git a/app/views/homework_bank/index.html.erb b/app/views/homework_bank/index.html.erb
index c76e70143..9e1f25e02 100644
--- a/app/views/homework_bank/index.html.erb
+++ b/app/views/homework_bank/index.html.erb
@@ -10,7 +10,7 @@
 </script>
 
 <div class="edu-class-container">
-  <p class="mb10"><i class="fa fa-map-marker mr5 color-grey"></i><%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path() %> > 题库</p>
+  <p class="mb10"><i class="fa fa-map-marker mr5 color-grey"></i><%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path() %> > 题库</p>
   <div class="edu-con-bg01 mt15">
     <div class="">
       <div class="edu-tab clearfix mb20">
diff --git a/app/views/homework_bank/set_public.js.erb b/app/views/homework_bank/set_public.js.erb
new file mode 100644
index 000000000..f3a982e14
--- /dev/null
+++ b/app/views/homework_bank/set_public.js.erb
@@ -0,0 +1,2 @@
+hideModal();
+$("#set_homework_public_<%= @homework.id %>").remove();
\ No newline at end of file
diff --git a/app/views/homework_bank/show.html.erb b/app/views/homework_bank/show.html.erb
index b020083aa..fb9dcbe88 100644
--- a/app/views/homework_bank/show.html.erb
+++ b/app/views/homework_bank/show.html.erb
@@ -18,7 +18,7 @@
 <div class="edu-class-container">
 <p class="mb10">
   <i class="fa fa-map-marker mr5 color-grey"></i>
-  <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path() %> > <%= @homework.user == User.current ? link_to('我的题库', homework_bank_index_path()) : link_to('公共题库', homework_bank_index_path(:type => 2)) %></p>
+  <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path() %> > <%= @homework.user == User.current ? link_to('我的题库', homework_bank_index_path()) : link_to('公共题库', homework_bank_index_path(:type => 2)) %></p>
 <div class="edu-con-top clearfix">
   <p class="ml15 fl color-grey">
     <% unless @homework.is_public %>