From b8e19bf4fc331fb236ab89b71ec069fdd3301d5f Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Thu, 9 Sep 2021 10:29:13 +0000
Subject: [PATCH] * Adjust GitLab MR Details Style.

---
 module/mr/lang/zh-cn.php | 3 +--
 module/mr/model.php      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 52ee8ed648..2d3c7a53df 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -77,8 +77,7 @@ $lang->mr->acceptMR       = "合并";
 $lang->mr->mergeFailed    = "无法合并，请核对合并请求状态";
 $lang->mr->mergeSuccess   = "已成功合并";
 
-$lang->mr->todomessage = "项目中指派给你了合并请求。";
-$lang->mr->attime = "时间在";
+$lang->mr->todomessage = "项目中指派给你了";
 
 
 /**
diff --git a/module/mr/model.php b/module/mr/model.php
index 2fd437baff..9efd8f2dd4 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -332,7 +332,7 @@ class mrModel extends model
                         $todo->idvalue      = $rawTodo->id;
                         $todo->pri          = 3;
                         $todo->name         = $this->lang->mr->common . ": " . $rawTodo->target->title;
-                        $todo->desc         = $this->app->user->account . $this->lang->mr->at . date("Y-m-d", strtotime($rawTodo->target->created_at)) . $this->lang->mr->on . '<a href="' . $rawTodo->target->web_url . '" target="_blank">' . $rawTodo->target->description .'</a>' . $this->lang->mr->todomessage . '</br>' . $this->app->user->account. $this->lang->mr->on . '<a href="' . $rawTodo->author->web_url . '/' . $rawTodo->project->path . '" target="_blank">' . $rawTodo->project->path .'</a>' . $this->lang->mr->todomessage;
+                        $todo->desc         = $this->app->user->account. $this->lang->mr->on . '<a href="' . $rawTodo->author->web_url . '/' . $rawTodo->project->path . '" target="_blank">' . $rawTodo->project->path .'</a>' . $this->lang->mr->todomessage . '<a href="' . $rawTodo->target->web_url . '" target="_blank">' . $this->lang->mr->common .'</a>' . '。';
                         $todo->status       = 'wait';
                         $todo->finishedBy   = '';