From 83b6c68be46b1c6bb6607c6bf6168ce686f52183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Tue, 11 Sep 2018 17:43:46 +0800 Subject: [PATCH] * Finish task#4660 --- module/project/model.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index dcac3cf732..a30b8ff710 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1605,9 +1605,9 @@ class projectModel extends model if(!empty($planStory)) { $count = 0; - foreach($planStory as $id => $story) + foreach($planStory as $id => $story) { - if($story->status == 'draft') + if($story->status == 'draft') { $count++; unset($planStory[$id]); @@ -1805,7 +1805,7 @@ class projectModel extends model public function unlinkMember($projectID, $account) { $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq('project')->andWhere('account')->eq($account)->exec(); - + $this->loadModel('user')->updateUserView($projectID, 'project', array($account)); $products = $this->getProducts($projectID, false); foreach($products as $productID => $productName) @@ -2795,6 +2795,11 @@ class projectModel extends model $html .= '
  • '; $html .= '' . $tree->storyId . '' . $this->lang->story->common . "" . $tree->title . ' ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . ''; break; + case 'branch': + $this->app->loadLang('branch'); + $html .= "
  • "; + $html .= "{$this->lang->branch->common}{$tree->name}"; + break; } if(isset($tree->children)) {