From 0b0493988dca487fcf44c9f109d194218cc71610 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 1 Jun 2021 15:52:06 +0800 Subject: [PATCH 1/2] * Fix bug#6455. --- module/my/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/my/control.php b/module/my/control.php index 3b8db82b08..84eecfc116 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -742,6 +742,7 @@ class my extends control if(!empty($_POST)) { $_POST['account'] = $this->app->user->account; + $_POST['groups'] = $this->dao->select('`group`')->from(TABLE_USERGROUP)->where('account')->eq($this->post->account)->fetchPairs('group', 'group'); $this->user->update($this->app->user->id); if(dao::isError()) die(js::error(dao::getError())); die(js::locate($this->createLink('my', 'profile'), 'parent')); From 59f09a1fb5234325c8dc10cb79f0b1832d1cf86e Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Tue, 1 Jun 2021 15:55:19 +0800 Subject: [PATCH 2/2] * Fix bug #12836. --- module/story/model.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index a99c27539b..4163dd29b3 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1192,10 +1192,11 @@ class storyModel extends model $story->status = $this->setStatusByReviewRules($reviewerList); if($story->status == 'closed') { - $story->closedBy = $this->app->user->account; - $story->closedDate = $now; - $story->assignedTo = 'closed'; - $story->stage = 'closed'; + $story->closedBy = $this->app->user->account; + $story->closedDate = $now; + $story->assignedTo = 'closed'; + $story->assignedDate = $now; + $story->stage = 'closed'; if($this->post->closedReason == 'done') $story->stage = 'released'; } }