* Fix bug#42752,42739

This commit is contained in:
zenggang
2023-12-29 03:22:37 +00:00
parent 8061d398b1
commit b59391f76d
3 changed files with 17 additions and 2 deletions
+2 -2
View File
@@ -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;
+1
View File
@@ -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);
+14
View File
@@ -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();