From b59391f76dbc308cba4477c85bb6b65e0394d246 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 29 Dec 2023 03:22:37 +0000
Subject: [PATCH] * Fix bug#42752,42739

---
 module/gitlab/config/dtable.php       |  4 ++--
 module/gitlab/ui/browsegroup.html.php |  1 +
 module/gitlab/ui/importissue.html.php | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/module/gitlab/config/dtable.php b/module/gitlab/config/dtable.php
index 52df96331a..adc549d2c7 100644
--- a/module/gitlab/config/dtable.php
+++ b/module/gitlab/config/dtable.php
@@ -143,8 +143,8 @@ $config->gitlab->dtable->group->fieldList['fullName']['name']  = 'fullName';
 $config->gitlab->dtable->group->fieldList['fullName']['type']  = 'avatarBtn';
 $config->gitlab->dtable->group->fieldList['fullName']['sortType'] = true;
 
-$config->gitlab->dtable->group->fieldList['path']['title'] = $lang->gitlab->group->path;
-$config->gitlab->dtable->group->fieldList['path']['name']  = 'full_path';
+$config->gitlab->dtable->group->fieldList['path']['title']    = $lang->gitlab->group->path;
+$config->gitlab->dtable->group->fieldList['path']['name']     = 'path';
 $config->gitlab->dtable->group->fieldList['path']['sortType'] = true;
 
 $config->gitlab->dtable->group->fieldList['createOn']['title'] = $lang->gitlab->group->createOn;
diff --git a/module/gitlab/ui/browsegroup.html.php b/module/gitlab/ui/browsegroup.html.php
index b40a252d5d..ec562e4dfe 100644
--- a/module/gitlab/ui/browsegroup.html.php
+++ b/module/gitlab/ui/browsegroup.html.php
@@ -44,6 +44,7 @@ foreach($config->gitlab->menus as $key => $method)
 foreach($gitlabGroupList as $gitlabGroup)
 {
     $gitlabGroup->fullName = $gitlabGroup->full_name;
+    $gitlabGroup->path     = $gitlabGroup->full_path;
     $gitlabGroup->gitlabID = $gitlabID;
     $gitlabGroup->createOn = substr($gitlabGroup->created_at, 0, 10);
     $gitlabGroup->isAdmin  = $app->user->admin || in_array($gitlabGroup->id, $adminGroupIDList);
diff --git a/module/gitlab/ui/importissue.html.php b/module/gitlab/ui/importissue.html.php
index 7a59510d6d..f95ca025f3 100644
--- a/module/gitlab/ui/importissue.html.php
+++ b/module/gitlab/ui/importissue.html.php
@@ -21,6 +21,19 @@ foreach($gitlabIssues as $issue)
     $issue->id       = $issue->iid;
 }
 
+if(empty($gitlabIssues))
+{
+    panel
+    (
+        setStyle('--zt-page-form-max-width', 'auto'),
+        setClass('panel-form'),
+        set::size('lg'),
+        set::title($lang->gitlab->importIssue),
+        $lang->gitlab->noImportableIssues
+    );
+}
+else
+{
 formBatchPanel
 (
     h::input
@@ -42,6 +55,7 @@ formBatchPanel
     set::onRenderRowCol(jsRaw('window.renderRowCol')),
     on::change('[data-name="productList"]', 'loadProductExecutions')
 );
+}
 
 render();