From 0c894a43555f01fc33a4e2eaf7c9555069fb630a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 22 Jun 2022 16:32:57 +0800
Subject: [PATCH 1/3] * Adjust style and codes.

---
 module/mr/css/browse.css         | 12 ++++--
 module/mr/view/browse.html.php   | 35 ++--------------
 module/repo/css/browse.css       |  1 -
 module/repo/css/common.css       | 11 +++++
 module/repo/model.php            | 72 +++++++++++++++++++++++++++++---
 module/repo/view/browse.html.php | 38 +----------------
 6 files changed, 92 insertions(+), 77 deletions(-)

diff --git a/module/mr/css/browse.css b/module/mr/css/browse.css
index e8ef6a456d..76e30fc3fd 100644
--- a/module/mr/css/browse.css
+++ b/module/mr/css/browse.css
@@ -1,3 +1,9 @@
-#dropMenu li > a{margin-top: 4px; margin-bottom: 4px; border-radius: 4px;}
-.tree li{padding: 0 0 0 8px;}
-.tree li a.selected{color: #3123ae; background: #f2eafc;}
+#repoList .tree li {padding: 0 0 0 10px;}
+#repoList .tree li > a {padding: 5px;}
+#repoList .hide-in-search .hidden {display: block !important; visibility: inherit !important;}
+#dropMenuRepo > div.table-row > div > div > ul > li > div {padding-left: 20px;}
+#repoList li > a.selected {color: #e9f2fb; background-color: #16a8f8; line-height: 20px; border-radius: 5px;}
+#repoList .tree li.has-list.open:before {border-left: 0px;}
+#repoList ul.tree-angles {margin-bottom: 0;}
+#repoList {margin: 0;}
+#repoList .tree > li {padding: 2px;}
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index ae0c53e382..e9bed68561 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -12,37 +12,10 @@
 <div id="mainMenu" class="clearfix">
   <div class='btn-toolbar pull-left'>
     <div class='btn-group' id="swapper">
-      <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;">
-        <span class='text' title='<?php echo $repo->name;?>'><?php echo $repo->name;?></span> <span class='caret'></span>
-      </a>
-      <div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList'>
-        <div class="input-control search-box has-icon-left has-icon-right search-example">
-          <input type="search" class="form-control search-input" />
-          <label class="input-control-icon-left search-icon">
-            <i class="icon icon-search"></i>
-          </label>
-          <a class="input-control-icon-right search-clear-btn">
-            <i class="icon icon-close icon-sm"></i>
-          </a>
-        </div>
-        <div class="list-group">
-          <div class="table-row">
-            <div class="table-col">
-              <ul class="tree tree-angles" data-ride="tree">
-                <?php
-                foreach($repos as $repo)
-                {
-                    echo '<li>';
-                    $selectedClass = $repo->id == $repoID ? 'selected' : '';
-                    echo html::a(inlink('browse', "repoID=$repo->id"), $repo->name, '_self', "class='clickable search-list-item $selectedClass' title='$repo->name' data-key='$repo->name'");
-                    echo '</li>';
-                }
-                ?>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
+      <?php
+      $link = inlink('browse', 'repoID=%s');
+      echo $this->repo->ajaxGetRepoSelect($repo, $objectID, $link, 'Gitlab');
+      ?>
     </div>
   </div>
   <div class="btn-toolBar pull-left">
diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css
index 983a9c5a40..b60a8bcc7a 100644
--- a/module/repo/css/browse.css
+++ b/module/repo/css/browse.css
@@ -8,7 +8,6 @@
 .pull-left li > a {line-height: 20px; border-radius: 5px;}
 .tree li.has-list.open:before {border-left: 0px;}
 #mainMenu > div.btn-toolbar.pull-left > div.btn-group.open {line-height: 20px;}
-#dropMenuRepo > div.table-row > div > div > ul > li {padding: 0}
 #dropMenuRepo > div.table-row > div > div > ul > li > div {padding-left: 20px;}
 #dropMenuRepo > div.table-row > div > div > ul > li > ul {padding-left: 10px;}
 #repoList .hide-in-search .hidden {display: block !important; visibility: inherit !important;}
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index 7d19921566..4aa6de4a3e 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -191,3 +191,14 @@ h3 {font-size: 16px;}
 .header-btn .btn > .text {text-overflow: unset !important;}
 
 #repoPageSize {right: 90px;}
+
+/* Style for repo select. */
+#repoList .tree li {padding: 0 0 0 15px;}
+#repoList .tree li > a {padding: 5px;}
+#repoList .hide-in-search .hidden {display: block !important; visibility: inherit !important;}
+#dropMenuRepo > div.table-row > div > div > ul > li > div {padding-left: 10px;}
+#repoList li > a.selected {color: #e9f2fb; background-color: #16a8f8; line-height: 20px; border-radius: 5px;}
+#repoList .tree li.has-list.open:before {border-left: 0px;}
+#repoList ul.tree-angles {margin-bottom: 0;}
+#repoList {margin: 0;}
+#repoList .tree > li {padding: 2px;}
diff --git a/module/repo/model.php b/module/repo/model.php
index 28e9de8774..73be9487c6 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -410,26 +410,26 @@ class repoModel extends model
         $repoPairs = $this->getRepoPairs($type, $projectID);
 
         $repos           = array();
-        $repos['gitlab'] = array();
-        $repos['svn']    = array();
-        $repos['git']    = array();
+        $repos['Gitlab'] = array();
+        $repos['SVN']    = array();
+        $repos['Git']    = array();
 
         foreach($repoPairs as $id => $repo)
         {
             if(strpos($repo, '[gitlab]') !== false)
             {
                 $repo = str_replace('[gitlab]', '', $repo);
-                $repos['gitlab'][$id] = $repo;
+                $repos['Gitlab'][$id] = $repo;
             }
             if(strpos($repo, '[svn]') !== false)
             {
                 $repo = str_replace('[svn]', '', $repo);
-                $repos['svn'][$id] = $repo;
+                $repos['SVN'][$id] = $repo;
             }
             if(strpos($repo, '[git]') !== false)
             {
                 $repo = str_replace('[git]', '', $repo);
-                $repos['git'][$id] = $repo;
+                $repos['Git'][$id] = $repo;
             }
         }
         return $repos;
@@ -2125,4 +2125,64 @@ class repoModel extends model
         foreach($executions as $execution) $pairs[$execution->id] = $execution->name;
         return $pairs;
     }
+
+    /**
+     * Ajax get repo select.
+     *
+     * @param  object $repo
+     * @param  int    $objectID
+     * @param  string $scm
+     * @access public
+     * @return void
+     */
+    public function ajaxGetRepoSelect($repo, $objectID = 0, $link = '', $scm = '')
+    {
+        if(empty($link)) $link = helper::createLink('repo', 'browse', "repoID=%s&branchID=&objectID=$objectID");
+        $html  = "<button data-toggle='dropdown' type='button' class='btn btn-link btn-limit text-ellipsis' title='{$repo->name}'>";
+        $html .= "<span class='text'>{$repo->name}</span>";
+        $html .= "<span class='caret' style='margin-bottom: -1px'></span>";
+        $html .= "</button>";
+        $html .= "<div id='dropMenuRepo' class='dropdown-menu search-list' data-ride='searchList' data-url=''>";
+        $html .= '<div class="input-control search-box has-icon-left has-icon-right">';
+        $html .= '<input type="search" class="form-control search-input"/>';
+        $html .= '<label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>';
+        $html .= '<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>';
+        $html .= '</div>';
+        $html .= '<div class="table-row">';
+        $html .= '<div class="table-col col-left">';
+        $html .= '<div class="list-group" id="repoList">';
+        $html .= "<ul class='tree tree-angles' data-ride='tree'>";
+
+        $tabName    = $this->app->tab;
+        $reposGroup = $this->getRepoGroup($tabName, $objectID);
+        foreach($reposGroup as $groupName => $group)
+        {
+            if(empty($group)) continue;
+            if($scm and strtolower($groupName) != strtolower($scm)) continue;
+
+            $html .= "<li data-idx='$groupName' data-id='$groupName' class='has-list open in'>";
+            $html .= "<i class='list-toggle icon'></i>";
+            $html .= "<div class='hide-in-search'>";
+            $html .= "<a class='text-muted'>{$groupName} <span class='label label-outline'> {$this->lang->repo->type}</span></a>";
+            $html .= "</div>";
+            $html .= "<ul data-idx='$groupName'>";
+            foreach($group as $id => $repoName)
+            {
+                $isSelected = $id == $repo->id ? 'selected' : '';
+                $repoName   = trim($repoName);
+
+                $html .= "<li data-idx='$repoName' data-id='$groupName-$repoName'>";
+                $html .= "<a href='" . sprintf($link, $id) . "' id='$groupName-$repoName' class='$isSelected text-ellipsis' title='$repoName' data-key='$repoName' data-app='{$tabName}'>$repoName</a>";
+                $html .= "</li>";
+            }
+            $html .= '</ul>';
+            $html .= '</li>';
+        }
+        $html .= '</ul>';
+        $html .= '</div>';
+        $html .= '</div>';
+        $html .= '</div>';
+        $html .= '</div>';
+        return $html;
+    }
 }
diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php
index a11637a997..a218997eb1 100644
--- a/module/repo/view/browse.html.php
+++ b/module/repo/view/browse.html.php
@@ -11,42 +11,8 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <div class='btn-group group'>
-      <button data-toggle='dropdown' type='button' class='btn btn-link btn-limit repo-select text-ellipsis' title='<?php $repos[$repoID];?>'>
-        <span class='text'><?php echo $repos[$repoID];?></span>
-        <span class='caret' style='margin-bottom: -1px'></span>
-      </button>
-      <div id='dropMenuRepo' class='dropdown-menu search-list' data-ride='searchList' data-url=''>
-        <div class="input-control search-box has-icon-left has-icon-right search-example">
-        <input type="search" class="form-control search-input" id="searchSource"/>
-          <label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
-          <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
-        </div>
-        <div class="table-row">
-          <div class="table-col col-left">
-            <div class="list-group" id="repoList">
-              <ul class='tree tree-angles' data-ride='tree'>
-              <?php foreach($repoGroup as $groupName => $group):?>
-              <?php if(empty($group)) continue;?>
-                <li data-idx='<?php echo $groupName;?>' data-id='<?php echo $groupName;?>' class='has-list open in' style='cursor: pointer;'><i class='list-toggle icon'></i>
-                  <div class='hide-in-search'><a class='text-muted'><?php echo $groupName;?></a><span class='label label-outline' style='margin-left:5px;'><?php echo $lang->repo->type;?></span></div>
-                  <ul data-idx='<?php echo $groupName;?>'>
-                  <?php
-                  foreach($group as $id => $repoName)
-                  {
-                      $isSelected = $id == $repoID ? 'selected' : '';
-                      $link = $this->createLink('repo', 'browse', "repoID=$id&branchID=&objectID=$objectID");
-                      echo "<li data-idx='$repoName' data-id='$groupName-$repoName'><a href='{$link}' id='$groupName-$repoName' class='$isSelected text-ellipsis' title='$repoName' data-key='$repoName' data-app='{$app->tab}'>$repoName</a></li>";
-                  }
-                  ?>
-                  </ul>
-                </li>
-              <?php endforeach;?>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
+    <div class='btn-group' id="swapper">
+      <?php echo $this->repo->ajaxGetRepoSelect($repo, $objectID);?>
     </div>
     <?php if(!empty($branches)):?>
     <div class='btn-group'>

From dd5cf777d901286d6579e1783f0ed5971532d6fd Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Jun 2022 08:23:55 +0800
Subject: [PATCH 2/3] * Modify function name.

---
 module/mr/view/browse.html.php   | 2 +-
 module/repo/model.php            | 4 ++--
 module/repo/view/browse.html.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index e9bed68561..129b879687 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -14,7 +14,7 @@
     <div class='btn-group' id="swapper">
       <?php
       $link = inlink('browse', 'repoID=%s');
-      echo $this->repo->ajaxGetRepoSelect($repo, $objectID, $link, 'Gitlab');
+      echo $this->repo->getReposMenu($repo, $objectID, $link, 'Gitlab');
       ?>
     </div>
   </div>
diff --git a/module/repo/model.php b/module/repo/model.php
index 73be9487c6..67b252172c 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -2127,7 +2127,7 @@ class repoModel extends model
     }
 
     /**
-     * Ajax get repo select.
+     * Get repos select menu.
      *
      * @param  object $repo
      * @param  int    $objectID
@@ -2135,7 +2135,7 @@ class repoModel extends model
      * @access public
      * @return void
      */
-    public function ajaxGetRepoSelect($repo, $objectID = 0, $link = '', $scm = '')
+    public function getReposMenu($repo, $objectID = 0, $link = '', $scm = '')
     {
         if(empty($link)) $link = helper::createLink('repo', 'browse', "repoID=%s&branchID=&objectID=$objectID");
         $html  = "<button data-toggle='dropdown' type='button' class='btn btn-link btn-limit text-ellipsis' title='{$repo->name}'>";
diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php
index a218997eb1..e4d900a817 100644
--- a/module/repo/view/browse.html.php
+++ b/module/repo/view/browse.html.php
@@ -12,7 +12,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <div class='btn-group' id="swapper">
-      <?php echo $this->repo->ajaxGetRepoSelect($repo, $objectID);?>
+      <?php echo $this->repo->getReposMenu($repo, $objectID);?>
     </div>
     <?php if(!empty($branches)):?>
     <div class='btn-group'>

From 08a3e4e816f68b2db3b4b2163b8d84880216c7e3 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Jun 2022 08:48:22 +0800
Subject: [PATCH 3/3] * Adjust code.

---
 module/repo/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/repo/model.php b/module/repo/model.php
index 67b252172c..c5fcfa2945 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -2131,6 +2131,7 @@ class repoModel extends model
      *
      * @param  object $repo
      * @param  int    $objectID
+     * @param  string $link
      * @param  string $scm
      * @access public
      * @return void