Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'

* Fix bug #16987. See merge request easycorp/zentaopms!723
2021-12-02 01:48:29 +00:00
parent fd0fb325fa 8c6e0fabfb
commit 4c29226156
10 changed files with 21 additions and 19 deletions
@@ -187,7 +187,7 @@ class testcase extends control
        }

        /* Display of branch label. */
-        $isShowBranch = $this->loadModel('branch')->isShowBranch($productID);
+        $showBranch = $this->loadModel('branch')->showBranch($productID);

        $product = $this->product->getById($productID);

@@ -218,7 +218,7 @@ class testcase extends control
        $this->view->suiteID       = $suiteID;
        $this->view->setModule     = true;
        $this->view->modulePairs   = $showModule ? $this->tree->getModulePairs($productID, 'case', $showModule) : array();
-        $this->view->isShowBranch  = $isShowBranch;
+        $this->view->showBranch    = $showBranch;

        $this->display();
    }