diff --git a/module/gitlab/config/dtable.php b/module/gitlab/config/dtable.php index 47b963bba9..42e3509030 100644 --- a/module/gitlab/config/dtable.php +++ b/module/gitlab/config/dtable.php @@ -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'; diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 47a67434ed..59acad3e2d 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -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; } diff --git a/module/gitlab/ui/browsetag.html.php b/module/gitlab/ui/browsetag.html.php index 5fa796ccb2..6426174668 100644 --- a/module/gitlab/ui/browsetag.html.php +++ b/module/gitlab/ui/browsetag.html.php @@ -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()) );