From 35daea16cea21beaab07f6f5ceb6f4d499eb77a2 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 8 Nov 2023 14:16:15 +0800
Subject: [PATCH] * Merge commit 0c361357db, fix bug #35525.

---
 module/story/control.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/story/control.php b/module/story/control.php
index 9849b52edf..1e1375ce66 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -337,6 +337,9 @@ class story extends control
             unset($customFields['plan'], $customFields['stage']);
             $showFields = str_replace(array('plan', 'stage'),  '', $showFields);
         }
+        $product = $this->loadModel('product')->getByID($productID);
+        if($product->type != 'normal') unset($customFields['branch']);
+
         $this->view->customFields = $customFields;
         $this->view->showFields   = $showFields;