Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug#42719

Browse Source
This commit is contained in:
zenggang
2023-12-29 06:53:34 +00:00
parent 352035e359
commit 7bf823954c
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/config/dtable.php
+6 -6
View File
@@ -224,10 +224,10 @@ $config->gitlab->dtable->tag->fieldList['updated']['type'] = 'text';
$config->gitlab->dtable->tag->fieldList['actions']['name'] = 'actions';
$config->gitlab->dtable->tag->fieldList['actions']['title'] = $lang->actions;
$config->gitlab->dtable->tag->fieldList['actions']['type'] = 'actions';
$config->gitlab->dtable->tag->fieldList['actions']['menu'] = array('delete');
$config->gitlab->dtable->tag->fieldList['actions']['menu'] = array('deleteTag');
$config->gitlab->dtable->tag->fieldList['actions']['list']['delete']['icon'] = 'trash';
$config->gitlab->dtable->tag->fieldList['actions']['list']['delete']['hint'] = $lang->gitlab->deleteTag;
$config->gitlab->dtable->tag->fieldList['actions']['list']['delete']['url'] = helper::createLink('gitlab', 'deleteTag', 'gitlabID={gitlabID}&projectID={projectID}&tag_name={tagName}');
$config->gitlab->dtable->tag->fieldList['actions']['list']['delete']['data-confirm'] = $lang->gitlab->tag->confirmDelete;
$config->gitlab->dtable->tag->fieldList['actions']['list']['delete']['className'] = 'ajax-submit';
$config->gitlab->dtable->tag->fieldList['actions']['list']['deleteTag']['icon'] = 'trash';
$config->gitlab->dtable->tag->fieldList['actions']['list']['deleteTag']['hint'] = $lang->gitlab->deleteTag;
$config->gitlab->dtable->tag->fieldList['actions']['list']['deleteTag']['url'] = helper::createLink('gitlab', 'deleteTag', 'gitlabID={gitlabID}&projectID={projectID}&tag_name={tagName}');
$config->gitlab->dtable->tag->fieldList['actions']['list']['deleteTag']['data-confirm'] = $lang->gitlab->tag->confirmDelete;
$config->gitlab->dtable->tag->fieldList['actions']['list']['deleteTag']['className'] = 'ajax-submit';
module/gitlab/model.php
+2
View File
@@ -2561,6 +2561,8 @@ class gitlabModel extends model
if($action == 'editUser') return $object->isAdmin;
if($action == 'deleteUser') return $object->isAdmin;
if($action == 'deleteTag') return !$object->protected;
return true;
}
module/gitlab/ui/browsetag.html.php
+3 -2
View File
@@ -62,7 +62,8 @@ dtable
(
set::cols($config->gitlab->dtable->tag->fieldList),
set::data($tagList),
set::sortLink(createLink('gitlab', 'browseTag', "gitlabID={$gitlabID}&projectID={$projectID}&orderBy={name}_{sortType}")),
set::sortLink(createLink('gitlab', 'browseTag', "gitlabID={$gitlabID}&projectID={$projectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::orderBy($orderBy),
set::onRenderCell(jsRaw('window.renderCell'))
set::onRenderCell(jsRaw('window.renderCell')),
set::footPager(usePager())
);