From 6bbfc2e8f389b90c10d9a34742c5e6f60704e8e8 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 26 Dec 2019 09:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=A2=98=E7=9A=84=E9=80=89=E7=94=A8?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E5=88=A0=E9=99=A4=E5=A4=A7=E9=A2=98?=
=?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/item_banks_controller.rb | 1 +
app/controllers/item_baskets_controller.rb | 4 +++-
app/views/item_banks/index.json.jbuilder | 1 +
config/routes.rb | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/controllers/item_banks_controller.rb b/app/controllers/item_banks_controller.rb
index d13244685..a63710336 100644
--- a/app/controllers/item_banks_controller.rb
+++ b/app/controllers/item_banks_controller.rb
@@ -8,6 +8,7 @@ class ItemBanksController < ApplicationController
items = ItemBankQuery.call(params)
@items_count = items.size
@items = paginate items.includes(:item_analysis, :user)
+ @item_basket_ids = current_user.item_baskets.pluck(:item_bank_id)
end
def create
diff --git a/app/controllers/item_baskets_controller.rb b/app/controllers/item_baskets_controller.rb
index fc27c96d7..7c4e951e5 100644
--- a/app/controllers/item_baskets_controller.rb
+++ b/app/controllers/item_baskets_controller.rb
@@ -36,7 +36,9 @@ class ItemBasketsController < ApplicationController
end
def delete_item_type
- # tip_exception() unless
+ baskets = ItemBasket.where(item_type: params[:item_type])
+ baskets.destroy_all
+ render_ok
end
private
diff --git a/app/views/item_banks/index.json.jbuilder b/app/views/item_banks/index.json.jbuilder
index 9ba3380d8..3699f8f3e 100644
--- a/app/views/item_banks/index.json.jbuilder
+++ b/app/views/item_banks/index.json.jbuilder
@@ -1,6 +1,7 @@
json.items @items.each do |item|
json.partial! "item_banks/item", locals: {item: item}
json.update_time item.updated_at&.strftime("%Y-%m-%d %H:%M")
+ json.choosed @item_basket_ids.include?(item.id)
json.author do
json.login item.user&.login
json.name item.user&.full_name
diff --git a/config/routes.rb b/config/routes.rb
index d4baf6dee..46c8e9511 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -63,6 +63,7 @@ Rails.application.routes.draw do
resources :item_baskets do
collection do
get :basket_list
+ delete :delete_item_type
end
end