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

* Adjust dtable sort init.

Browse Source
This commit is contained in:
caoyanyi
2023-11-06 11:13:35 +08:00
parent 9a52fee2dc
commit de09522cfc
8 changed files with 7 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/js/browse.ui.js
-8
View File
@@ -1,11 +1,3 @@
window.createSortLink = function(col)
{
var sort = col.name + '_asc';
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{orderBy}', sort);
}
window.renderCell = function(result, {col, row})
{
if(col.name === 'name')
module/gitlab/js/browsegroup.ui.js
-8
View File
@@ -9,14 +9,6 @@ window.renderCell = function(result, {col, row})
return result;
};
window.createSortLink = function(col)
{
var sort = col.name + '_asc';
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{orderBy}', sort);
}
function searchGroup()
{
loadPage({method:'post', data: {keyword: $('#keyword').val()}, target: '#table-gitlab-browsegroup>*'});
module/gitlab/js/browseproject.ui.js
-8
View File
@@ -1,11 +1,3 @@
window.createSortLink = function(col)
{
var sort = col.name + '_asc';
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{orderBy}', sort);
}
window.renderCell = function(result, {col, row})
{
if(col.name === 'star')
module/gitlab/js/browseuser.ui.js
-8
View File
@@ -1,11 +1,3 @@
window.createSortLink = function(col)
{
var sort = col.name + '_asc';
if(sort == orderBy) sort = col.name + '_desc';
return sortLink.replace('{orderBy}', sort);
}
function searchUser()
{
loadPage({method:'post', data: {keyword: $('#keyword').val()}, target: '#table-gitlab-browseuser>*'});
module/gitlab/ui/browse.html.php
+2 -5
View File
@@ -27,17 +27,14 @@ toolbar
);
jsVar('confirmDelete', $lang->gitlab->confirmDelete);
jsVar('orderBy', $orderBy);
jsVar('canBrowseProject', common::hasPriv('gitlab', 'browseProject'));
jsVar('sortLink', helper::createLink('gitlab', 'browse', "orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"));
dtable
(
set::cols(array_values($config->gitlab->dtable->fieldList)),
set::data($tableData),
set::sortLink(jsRaw('createSortLink')),
set::orderBy($orderBy),
set::sortLink(createLink('gitlab', 'browse', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::onRenderCell(jsRaw('window.renderCell')),
set::footPager(usePager()),
);
render();
module/gitlab/ui/browsegroup.html.php
+1 -3
View File
@@ -10,8 +10,6 @@ declare(strict_types=1);
*/
namespace zin;
jsVar('orderBy', $orderBy);
jsVar('sortLink', helper::createLink('gitlab', 'browseGroup', "gitlabID={$gitlabID}&orderBy={orderBy}"));
jsVar('gitlabUrl', $gitlab->url);
$canCreate = hasPriv('instance', 'manage');
@@ -99,7 +97,7 @@ dtable
(
set::cols($config->gitlab->dtable->group->fieldList),
set::data($gitlabGroupList),
set::sortLink(jsRaw('createSortLink')),
set::sortLink(createLink('gitlab', 'browseGroup', "gitlabID={$gitlabID}&orderBy={name}_{sortType}")),
set::onRenderCell(jsRaw('window.renderCell')),
set::orderBy($orderBy),
);
module/gitlab/ui/browseproject.html.php
+2 -3
View File
@@ -10,8 +10,6 @@ declare(strict_types=1);
*/
namespace zin;
jsVar('orderBy', $orderBy);
jsVar('sortLink', helper::createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"));
jsVar('projectStar', $lang->gitlab->project->star);
jsVar('projectFork', $lang->gitlab->project->fork);
@@ -100,7 +98,8 @@ dtable
(
set::cols($config->gitlab->dtable->project->fieldList),
set::data($gitlabProjectList),
set::sortLink(jsRaw('createSortLink')),
set::orderBy($orderBy),
set::sortLink(createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::onRenderCell(jsRaw('window.renderCell')),
set::footPager(usePager())
);
module/gitlab/ui/browseuser.html.php
+2 -5
View File
@@ -10,8 +10,7 @@ declare(strict_types=1);
*/
namespace zin;
jsVar('orderBy', $orderBy);
jsVar('sortLink', helper::createLink('gitlab', 'browseUser', "gitlabID={$gitlabID}&orderBy={orderBy}"));
jsVar('gitlabUrl', $gitlab->url);
$canCreate = hasPriv('instance', 'manage');
@@ -94,9 +93,7 @@ dtable
(
set::cols($config->gitlab->dtable->user->fieldList),
set::data($gitlabUserList),
set::sortLink(jsRaw('createSortLink')),
set::sortLink(createLink('gitlab', 'browseUser', "gitlabID={$gitlabID}&orderBy={name}_{sortType}")),
set::onRenderCell(jsRaw('window.renderCell')),
set::orderBy($orderBy),
);
render();