Closes #877: Templates should show the library source columns

richardwilkes · Aug 16, 2024 · 5608035 · 5608035
1 parent 8761fd2
commit 5608035
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -101,3 +101,4 @@ issues:
     - "package-comments: should have a package comment"
     - "stdmethods: method MarshalJSON"
     - "stdmethods: method UnmarshalJSON"
+    - "SA1003: value of type bool cannot be used with binary.Write"
diff --git a/ux/equipment_provider.go b/ux/equipment_provider.go
@@ -202,7 +202,7 @@ func (p *equipmentProvider) ColumnIDs() []int {
 	}
 	columnIDs = append(columnIDs, gurps.EquipmentReferenceColumn)
 	if p.forPage {
-		if entity := p.DataOwner().OwningEntity(); entity != nil && !entity.SheetSettings.HideSourceMismatch {
+		if entity := p.DataOwner().OwningEntity(); entity == nil || !entity.SheetSettings.HideSourceMismatch {
 			columnIDs = append(columnIDs, gurps.EquipmentLibSrcColumn)
 		}
 	}

diff --git a/ux/notes_provider.go b/ux/notes_provider.go
@@ -117,7 +117,7 @@ func (p *notesProvider) ColumnIDs() []int {
 		gurps.NoteReferenceColumn,
 	}
 	if p.forPage {
-		if entity := p.DataOwner().OwningEntity(); entity != nil && !entity.SheetSettings.HideSourceMismatch {
+		if entity := p.DataOwner().OwningEntity(); entity == nil || !entity.SheetSettings.HideSourceMismatch {
 			columnIDs = append(columnIDs, gurps.NoteLibSrcColumn)
 		}
 	}

diff --git a/ux/skills_provider.go b/ux/skills_provider.go
@@ -158,7 +158,7 @@ func (p *skillsProvider) ColumnIDs() []int {
 	}
 	columnIDs = append(columnIDs, gurps.SkillReferenceColumn)
 	if p.forPage {
-		if entity := p.DataOwner().OwningEntity(); entity != nil && !entity.SheetSettings.HideSourceMismatch {
+		if entity := p.DataOwner().OwningEntity(); entity == nil || !entity.SheetSettings.HideSourceMismatch {
 			columnIDs = append(columnIDs, gurps.SkillLibSrcColumn)
 		}
 	}

diff --git a/ux/spells_provider.go b/ux/spells_provider.go
@@ -171,7 +171,7 @@ func (p *spellsProvider) ColumnIDs() []int {
 	}
 	columnIDs = append(columnIDs, gurps.SpellReferenceColumn)
 	if p.forPage {
-		if entity := p.DataOwner().OwningEntity(); entity != nil && !entity.SheetSettings.HideSourceMismatch {
+		if entity := p.DataOwner().OwningEntity(); entity == nil || !entity.SheetSettings.HideSourceMismatch {
 			columnIDs = append(columnIDs, gurps.SpellLibSrcColumn)
 		}
 	}

diff --git a/ux/traits_provider.go b/ux/traits_provider.go
@@ -157,7 +157,7 @@ func (p *traitsProvider) ColumnIDs() []int {
 	}
 	columnIDs = append(columnIDs, gurps.TraitReferenceColumn)
 	if p.forPage {
-		if entity := p.DataOwner().OwningEntity(); entity != nil && !entity.SheetSettings.HideSourceMismatch {
+		if entity := p.DataOwner().OwningEntity(); entity == nil || !entity.SheetSettings.HideSourceMismatch {
 			columnIDs = append(columnIDs, gurps.TraitLibSrcColumn)
 		}
 	}