Oops, fix bug with restricted zones from item search in wardrobe
Oh oops, I forgot one of the kinds of restricted zones when refactoring how we load search data in wardrobe-2020! This made most items with restricted zones (like Be Gone items) not work correctly when you search for them to add them to the item—though it *does* work correctly when you reload the page or change the species, to get to load a different way.
This commit is contained in:
parent
27774d908f
commit
9f62d7cdbe
2 changed files with 10 additions and 4 deletions
|
@ -28,6 +28,12 @@ class ItemsController < ApplicationController
|
||||||
render json: {
|
render json: {
|
||||||
items: @items.as_json(
|
items: @items.as_json(
|
||||||
methods: [:nc?, :pb?, :owned?, :wanted?],
|
methods: [:nc?, :pb?, :owned?, :wanted?],
|
||||||
|
include: {
|
||||||
|
restricted_zones: {
|
||||||
|
only: [:id, :depth, :label],
|
||||||
|
methods: [:is_commonly_used_by_items],
|
||||||
|
},
|
||||||
|
},
|
||||||
),
|
),
|
||||||
appearances: load_appearances.as_json(
|
appearances: load_appearances.as_json(
|
||||||
include: {
|
include: {
|
||||||
|
|
|
@ -201,10 +201,10 @@ function normalizeItemSearchAppearance(data, item) {
|
||||||
__typename: "ItemAppearance",
|
__typename: "ItemAppearance",
|
||||||
id: `item-${item.id}-body-${data.body.id}`,
|
id: `item-${item.id}-body-${data.body.id}`,
|
||||||
layers: data.swf_assets.map(normalizeSwfAssetToLayer),
|
layers: data.swf_assets.map(normalizeSwfAssetToLayer),
|
||||||
restrictedZones: data.swf_assets
|
restrictedZones: [
|
||||||
.map((a) => a.restricted_zones)
|
...item.restricted_zones,
|
||||||
.flat()
|
...data.swf_assets.map((a) => a.restricted_zones).flat(),
|
||||||
.map(normalizeZone),
|
].map(normalizeZone),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue