Merge branch 'kanban' into 'sprint/182_tianshujie_47336'

# Conflicts: # module/execution/control.php
2022-01-12 07:53:04 +00:00
parent c5bf8afbc2 dad8b2f970
commit 5a8c11cb6e
6 changed files with 185 additions and 180 deletions
@@ -1992,6 +1992,18 @@ class execution extends control
            $userList[$account]['avatar'] = $avatar;
        }

+        /* Get execution's product. */
+        $productID = 0;
+        $products  = $this->loadModel('product')->getProducts($execution->project);
+        if($products) $productID = key($products);
+
+        $plans    = $this->execution->getPlans($products);
+        $allPlans = array('' => '');
+        if(!empty($plans))
+        {
+            foreach($plans as $plan) $allPlans += $plan;
+        }
+
        $this->view->title            = $this->lang->kanban->view;
        $this->view->users            = $users;
        $this->view->regions          = $kanbanData;
@@ -2000,6 +2012,8 @@ class execution extends control
        $this->view->browseType       = $browseType;
        $this->view->orderBy          = $orderBy;
        $this->view->groupBy          = $groupBy;
+        $this->view->productID        = $productID;
+        $this->view->allPlans         = $allPlans;
        $this->view->executionActions = $executionActions;
        $this->display();
    }