From bf1cdda8f59278de30f689f860348698c12b6744 Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Wed, 3 Jun 2020 09:02:28 +0800 Subject: [PATCH] * Add program to task and story. --- module/story/model.php | 1 + module/task/model.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/module/story/model.php b/module/story/model.php index 2d7fae2548..33a0e46ed6 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -320,6 +320,7 @@ class storyModel extends model $story->status = ($stories->needReview[$i] == 0 and !$forceReview) ? 'active' : 'draft'; $story->keywords = $stories->keywords[$i]; $story->product = $productID; + $story->program = $this->session->program; $story->openedBy = $this->app->user->account; $story->openedDate = $now; $story->version = 1; diff --git a/module/task/model.php b/module/task/model.php index c31df59217..0c6c980f15 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -35,6 +35,7 @@ class taskModel extends model ->setDefault('project', $projectID) ->setDefault('estimate,left,story', 0) ->setDefault('status', 'wait') + ->setDefault('program', $this->session->program) ->setIF($this->post->estimate != false, 'left', $this->post->estimate) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story)) ->setDefault('estStarted', '0000-00-00') @@ -285,6 +286,7 @@ class taskModel extends model $data[$i]->pri = $tasks->pri[$i]; $data[$i]->estimate = $tasks->estimate[$i]; $data[$i]->left = $tasks->estimate[$i]; + $data[$i]->program = $this->session->program; $data[$i]->project = $projectID; $data[$i]->estStarted = empty($tasks->estStarted[$i]) ? '0000-00-00' : $tasks->estStarted[$i]; $data[$i]->deadline = empty($tasks->deadline[$i]) ? '0000-00-00' : $tasks->deadline[$i];