From 12935f3ead2c2d7a9cb23cc13e195be0e1b16ec6 Mon Sep 17 00:00:00 2001 From: lichengjun Date: Tue, 7 Sep 2021 02:33:36 +0000 Subject: [PATCH 1/2] * Adjust GitLab MR TODO Detail. --- module/mr/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/mr/model.php b/module/mr/model.php index 4d0db5997d..1119bc636d 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -306,7 +306,7 @@ class mrModel extends model $todo->idvalue = $do->id; $todo->pri = 1; $todo->name = $do->target->title; - $todo->desc = $do->target->description . "
" . $this->todoDescriptionLink($gitlabID, $projectID); + $todo->desc = $do->target->description . "
" . '' . $this->todoDescriptionLink($gitlabID, $projectID) .''; $todo->finishedBy = $this->app->user->account; $this->dao->insert(TABLE_TODO)->data($todo)->exec(); } From d5b52bc7ad77c49cd72c7ea3063206f7486fa792 Mon Sep 17 00:00:00 2001 From: Guan Xiying Date: Tue, 7 Sep 2021 10:50:34 +0800 Subject: [PATCH 2/2] * Fix viewDiif. --- module/mr/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/mr/control.php b/module/mr/control.php index ad75a908e9..b08684f9b7 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -277,7 +277,7 @@ class mr extends control } } - $this->view->title = $this->lang->mr->viewDiif; + $this->view->title = $this->lang->mr->viewDiff; $this->view->diffs = $diffs; $this->view->arrange = $arrange; $this->display();