Change of approach

ryanmitchell · Feb 1, 2024 · c4c1b86 · c4c1b86
1 parent 6080b26
commit c4c1b86
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
@@ -133,8 +133,8 @@ public function edit($taxonomy)
             'collections' => $taxonomy->collections()->map->handle()->all(),
             'sites' => $taxonomy->sites()->all(),
             'preview_targets' => $taxonomy->basePreviewTargets(),
-            'term_template' => $taxonomy->termTemplate,
-            'template' => $taxonomy->template,
+            'term_template' => $taxonomy->hasCustomTermTemplate() ? $taxonomy->termTemplate() : null,
+            'template' => $taxonomy->hasCustomTemplate() ? $taxonomy->template() : null,
             'layout' => $taxonomy->layout(),
         ];
 

diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
@@ -44,8 +44,8 @@ class Taxonomy implements Arrayable, ArrayAccess, AugmentableContract, Contract,
     protected $revisions = false;
     protected $searchIndex;
     protected $previewTargets = [];
-    public $template;
-    public $termTemplate;
+    protected $template;
+    protected $termTemplate;
     protected $layout;
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
@@ -518,4 +518,14 @@ private function previewTargetsForFile()
             ];
         })->filter()->values()->all();
     }
+
+    public function hasCustomTemplate()
+    {
+        return $this->template !== null;
+    }
+
+    public function hasCustomTermTemplate()
+    {
+        return $this->termTemplate !== null;
+    }
 }