Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/users_controller.rb

@@ -1071,6 +1071,16 @@ class UsersController < ApplicationController
     end
   end
 
+  def delete_homework_bank
+    bank = User.current.homework_banks.where(:id => params[:bank]).first
+    ActiveRecord::Base.transaction do
+      if bank.present?
+        HomeworkCommon.where(:homework_bank_id => bank.id).update_all(:homework_bank_id => nil)
+        bank.destroy
+      end
+    end
+  end
+
   #导入作业
   def user_import_homeworks
     @user = User.current

app/views/users/_homework_repository_list.html.erb

@@ -3,7 +3,7 @@
     <p class="sy_tab_con_p">暂无可显示的内容~</p>
 <% else %>
     <% homeworks.each do |homework| %>
-    <ul class="sy_classlist">
+    <ul class="sy_classlist" id="homework_bank_item_<%= homework.id %>">
       <span class="hw_icons_cir fl mt5 mr5"></span>
       <div class="fl ">
         <h3 class="sy_classlist_title fl">
@@ -58,6 +58,9 @@
           <a href="javascript:void(0);" class="hw_btn_green fr mt5" onclick="choose_course('<%=User.current.id%>', '<%=homework.id %>');" data-remote="true">发送</a>
       <% end %>
       <a href="javascript:void(0);" class="hw_btn_green fr mt5 mr5" onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>homework.id,:is_import => 0) %>')" data-remote="true">预览</a>
+      <% if @type == '1' %>
+        <a href="javascript:void(0);" class="hw_btn_grey fr mt5 mr5" onclick="delete_confirm_box_2('<%= delete_homework_bank_users_path(:bank => homework.id) %>', '是否确认删除？')">删除</a>
+      <% end %>
       <div class="cl"></div>
     </ul>
 <% end %>

app/views/users/delete_homework_bank.js.erb

@@ -0,0 +1,2 @@
+hideModal();
+$("#homework_bank_item_<%= params[:bank] %>").remove();

app/views/users/user_homeworks.html.erb

@@ -15,7 +15,7 @@
                 function (data) {
                 }
         );
-    };
+    }
 
     function choose_course(user_id, hw_id) {
         $.ajax({

config/routes.rb

@@ -716,6 +716,7 @@ RedmineApp::Application.routes.draw do
       get 'all_journals'
       get 'user_archive_courses'
       post 'reply_detail'
+      delete 'delete_homework_bank'
     end
 
     member do