From 543e58ada0ce01dde619daa8d069f788606ce540 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 26 Aug 2020 11:15:19 +0800
Subject: [PATCH] * fix task not show in cmmigantt block sometimes.

---
 module/block/control.php     |  2 +-
 module/programplan/model.php | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index b31f136d20..b63a02e337 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1118,7 +1118,7 @@ class block extends control
         $productID = isset($this->session->product) ? 0 : $this->session->product;
         if($productID && !array_key_exists($productID, $products)) $productID = 0;
 
-        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->program, $productID);
+        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->program, $productID, 0, 'task');
         $this->view->products  = $products;
         $this->view->productID = $productID;
     }
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 4eb96fe7b4..1a66e9cd71 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -99,7 +99,17 @@ class programplanModel extends model
         return $pairs;
     }
 
-    public function getDataForGantt($programID, $productID, $baselineID = 0)
+    /**
+     * Get gantt data
+     *
+     * @param  int    $programID
+     * @param  int    $productID
+     * @param  int    $baselineID
+     * @param  string $selectCustom
+     * @access public
+     * @return string
+     */
+    public function getDataForGantt($programID, $productID, $baselineID = 0, $selectCustom = '')
     {
         $this->loadModel('stage');
 
@@ -161,7 +171,8 @@ class programplanModel extends model
         $section      = 'browse';
         $object       = 'stageCustom';
         $setting      = $this->loadModel('setting');
-        $selectCustom = $setting->getItem("owner={$owner}&module={$module}&section={$section}&key={$object}");
+
+        if(empty($selectCustom)) $selectCustom = $setting->getItem("owner={$owner}&module={$module}&section={$section}&key={$object}");
 
         $tasks = array();
         if(strpos($selectCustom, 'task') !== false)