diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue index b87f2dd9..426aa61a 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue @@ -198,6 +198,7 @@ export default { equipped: { $ne: true }, removed: { $ne: true }, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, }, { sort: { order: 1 }, }); diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue index a5fd932a..39c21a70 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue @@ -456,7 +456,7 @@ const propertyHandlers = { }, toggle(prop) { if ( - prop.deactivatedByAncestor || !prop.showUI + prop.deactivatedByToggle || prop.deactivatedByAncestor || !prop.showUI ) return { propPath: null }; return { propPath: 'toggle' }; }, @@ -580,6 +580,7 @@ export default { 'ancestors.id': this.creatureId, removed: { $ne: true }, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, showUI: true, }, { sort: { order: 1 } diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue index 324b64fa..416e8b00 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue @@ -152,6 +152,7 @@ export default { removed: { $ne: true }, equipped: { $ne: true }, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, }, { sort: { order: 1 }, }).fetch(); @@ -168,6 +169,7 @@ export default { equipped: { $ne: true }, removed: { $ne: true }, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, }, { sort: { order: 1 }, }); diff --git a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue index 18069fc2..039209e2 100644 --- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue +++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue @@ -450,6 +450,7 @@ export default { type: 'toggle', removed: { $ne: true }, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, showUI: true, }, { sort: { order: 1 } diff --git a/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue index 72f29b4f..b21a1a2b 100644 --- a/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue +++ b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue @@ -49,6 +49,7 @@ export default { type: 'toggle', showUI: true, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, }, { type: { $ne: 'toggle' }, diff --git a/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue b/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue index 32edef29..bbb026b5 100644 --- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue +++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue @@ -42,6 +42,7 @@ export default { type: 'toggle', showUI: true, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, }, { type: { $ne: 'toggle' }, diff --git a/app/imports/client/ui/properties/components/inventory/ContainerCard.vue b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue index b2d6de9f..fee97c5b 100644 --- a/app/imports/client/ui/properties/components/inventory/ContainerCard.vue +++ b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue @@ -99,6 +99,7 @@ export default { removed: { $ne: true }, equipped: { $ne: true }, deactivatedByAncestor: { $ne: true }, + deactivatedByToggle: { $ne: true }, }, { sort: { order: 1 }, });