Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR

Browse Source
This commit is contained in:
dingguodong
2021-09-07 10:51:12 +08:00
parent 8e8875319f d5b52bc7ad
commit 70f0136b2b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+1 -1
View File
@@ -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();
module/mr/model.php
+1 -1
View File
@@ -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 . "<br>" . $this->todoDescriptionLink($gitlabID, $projectID);
$todo->desc = $do->target->description . "<br>" . '<a href="' . $this->todoDescriptionLink($gitlabID, $projectID) . '"target="_blank">' . $this->todoDescriptionLink($gitlabID, $projectID) .'</a>';
$todo->finishedBy = $this->app->user->account;
$this->dao->insert(TABLE_TODO)->data($todo)->exec();
}