* Merge commit 0c361357db, fix bug #35525.

2023-11-08 14:16:15 +08:00
parent fb5aabab50
commit 35daea16ce
1 changed files with 3 additions and 0 deletions
@@ -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;