From 63fa9d9fd5e9ee019c66c65bb2bc04b6ae63092b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 13 Apr 2023 16:00:40 +0800
Subject: [PATCH 1/4] * Modify mr projects get.

---
 module/gitlab/model.php | 9 +++++----
 module/mr/control.php   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index f83126aaaf..9c0e529751 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -1020,16 +1020,17 @@ class gitlabModel extends model
     /**
      * Get single project by API.
      *
-     * @param  int $gitlabID
-     * @param  int $projectID
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  bool   $useUser
      * @access public
      * @return object
      */
-    public function apiGetSingleProject($gitlabID, $projectID)
+    public function apiGetSingleProject($gitlabID, $projectID, $useUser = false)
     {
         if(isset($this->projects[$gitlabID][$projectID])) return $this->projects[$gitlabID][$projectID];
 
-        $url = sprintf($this->getApiRoot($gitlabID, false), "/projects/$projectID");
+        $url = sprintf($this->getApiRoot($gitlabID, $useUser), "/projects/$projectID");
         $this->projects[$gitlabID][$projectID] = json_decode(commonModel::http($url, $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false));
         return $this->projects[$gitlabID][$projectID];
     }
diff --git a/module/mr/control.php b/module/mr/control.php
index 503fd7c6cc..6d5f6e3b4d 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -960,7 +960,7 @@ class mr extends control
         $projects = $scm == 'gitlab' ? $this->$scm->apiGetForks($hostID, $projectID) : array();
 
         /* Second step: get project itself. */
-        $projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID);
+        $projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID, true);
 
         /* Last step: find its upstream recursively. */
         $project = $this->$scm->apiGetUpstream($hostID, $projectID);

From 2c4f976c143c76758636fcd4ee6b82dc20fe67bc Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 14 Apr 2023 09:16:57 +0800
Subject: [PATCH 2/4] * Modify action edit style.

---
 module/doc/js/view.js            | 6 ++++++
 module/doc/view/content.html.php | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/doc/js/view.js b/module/doc/js/view.js
index a2babcc1fb..a66fa5fe3e 100644
--- a/module/doc/js/view.js
+++ b/module/doc/js/view.js
@@ -8,6 +8,12 @@ $(function()
     })
 
     $('.menu-actions > a').blur(function() {$(this).css('background', 'none');})
+
+    $('.comment-edit-form').ajaxForm({
+        success: function(data) {
+            location.reload();
+        }
+    })
 })
 
 /**
diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index 4c2735ae26..26e1f012c1 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -28,7 +28,6 @@
             </div>
           </div>
           <div class="actions">
-            <span class='text'><?php echo$lang->doc->diff?></span>
             <?php echo html::a("javascript:fullScreen()", '<span class="icon-fullscreen"></span>', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");?>
             <?php if(common::hasPriv('doc', 'collect')):?>
             <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>

From 50b734184fc3568476e15e5b3728ec0e0d84dfee Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 14 Apr 2023 09:39:29 +0800
Subject: [PATCH 3/4] * Fix bug #34165.

---
 module/doc/css/view.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index fb7a71f9ea..516951a1b7 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -25,6 +25,8 @@
 .article-content .info .keywords .label {padding-right:8px; padding-left:8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height:22px; line-height:14px; margin-right:4px;}
 
 .article-content {width: 100%; display: inline-block;}
+#outlineMenu {max-width: 200px;}
+#outlineMenu .tree li > a {text-overflow: clip;}
 .outline-toggle {position: absolute; right: 20px; top: 50px;}
 .outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
 .outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}

From eae7f2324538fa40712c2824a9d95892a3f57088 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 14 Apr 2023 10:18:06 +0800
Subject: [PATCH 4/4] * Fix bug #34156.

---
 module/doc/css/view.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index 516951a1b7..b65121015b 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -25,6 +25,7 @@
 .article-content .info .keywords .label {padding-right:8px; padding-left:8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height:22px; line-height:14px; margin-right:4px;}
 
 .article-content {width: 100%; display: inline-block;}
+.article-content.comment .comment-content {width: 94%;}
 #outlineMenu {max-width: 200px;}
 #outlineMenu .tree li > a {text-overflow: clip;}
 .outline-toggle {position: absolute; right: 20px; top: 50px;}