From 6ea6983436ec46f2aa832b2c10b3faeecc724e43 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 10 Nov 2023 15:02:30 +0800 Subject: [PATCH] * Adjust dtable sort params. --- module/account/js/browse.ui.js | 7 ------- module/account/ui/browse.html.php | 6 ++---- module/artifactrepo/js/browse.ui.js | 7 ------- module/artifactrepo/ui/browse.html.php | 8 ++------ module/branch/js/manage.ui.js | 7 ------- module/compile/js/browse.ui.js | 10 +--------- module/compile/ui/browse.html.php | 6 ++---- module/execution/js/common.ui.js | 7 ------- module/gitea/js/browse.ui.js | 8 -------- module/gitea/ui/browse.html.php | 5 ++--- module/gogs/js/browse.ui.js | 8 -------- module/gogs/ui/browse.html.php | 5 ++--- module/host/js/browse.ui.js | 8 -------- module/host/js/browseimage.ui.js | 8 -------- module/host/ui/browse.html.php | 7 +++---- module/host/ui/browseimage.html.php | 7 +++---- module/jenkins/js/browse.ui.js | 8 -------- module/jenkins/ui/browse.html.php | 7 ++----- module/job/js/browse.ui.js | 10 +--------- module/job/ui/browse.html.php | 7 ++----- module/mr/control.php | 2 -- module/mr/js/common.ui.js | 6 ------ module/mr/ui/browse.html.php | 6 ++---- module/mr/ui/browsebyexecution.html.php | 6 ++---- module/project/js/common.ui.js | 7 ------- module/release/js/browse.ui.js | 7 ------- module/repo/js/maintain.ui.js | 7 ------- module/repo/ui/maintain.html.php | 6 ++---- module/repo/ui/review.html.php | 1 + module/serverroom/js/browse.ui.js | 7 ------- module/serverroom/ui/browse.html.php | 6 ++---- module/sonarqube/js/browse.ui.js | 8 -------- module/sonarqube/ui/browse.html.php | 5 ++--- module/space/control.php | 1 - module/space/js/browse.ui.js | 7 ------- module/space/ui/browse.html.php | 6 ++---- module/zahost/control.php | 2 -- module/zahost/js/browse.ui.js | 8 -------- module/zahost/ui/browse.html.php | 4 +--- module/zahost/ui/browseimage.html.php | 12 ++---------- module/zanode/control.php | 1 - module/zanode/js/browse.ui.js | 8 -------- module/zanode/ui/browse.html.php | 6 ++---- 43 files changed, 40 insertions(+), 235 deletions(-) delete mode 100644 module/account/js/browse.ui.js delete mode 100644 module/mr/js/common.ui.js delete mode 100644 module/repo/js/maintain.ui.js delete mode 100644 module/serverroom/js/browse.ui.js diff --git a/module/account/js/browse.ui.js b/module/account/js/browse.ui.js deleted file mode 100644 index f0c0aba9d3..0000000000 --- a/module/account/js/browse.ui.js +++ /dev/null @@ -1,7 +0,0 @@ -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - - return sortLink.replace('{orderBy}', sort); -} \ No newline at end of file diff --git a/module/account/ui/browse.html.php b/module/account/ui/browse.html.php index e9262a5a19..78b4ee9057 100644 --- a/module/account/ui/browse.html.php +++ b/module/account/ui/browse.html.php @@ -31,15 +31,13 @@ toolbar $canCreate ? item(set($createItem)) : null, ); -jsVar('orderBy', $orderBy); -jsVar('sortLink', helper::createLink('account', 'browse', "browseType=$browseType¶m=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); - dtable ( set::userMap($users), set::cols(array_values($config->account->dtable->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('account', 'browse', "browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")), + set::orderBy($orderBy), set::footPager(usePager()), ); diff --git a/module/artifactrepo/js/browse.ui.js b/module/artifactrepo/js/browse.ui.js index 507a9c66c9..8262f16d8f 100644 --- a/module/artifactrepo/js/browse.ui.js +++ b/module/artifactrepo/js/browse.ui.js @@ -7,13 +7,6 @@ $(function() }); }); -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - return sortLink.replace('{orderBy}', sort); -} - window.renderList = function (result, {col, row, value}) { if(col.name === 'status') diff --git a/module/artifactrepo/ui/browse.html.php b/module/artifactrepo/ui/browse.html.php index 23bd06cb70..b85a58fb5a 100644 --- a/module/artifactrepo/ui/browse.html.php +++ b/module/artifactrepo/ui/browse.html.php @@ -11,8 +11,6 @@ declare(strict_types=1); namespace zin; jsVar('pageLink', $pageLink); -jsVar('orderBy', $orderBy); -jsVar('sortLink', $this->createLink('artifactrepo', 'browse', "browseType={$browseType}&orderBy={orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}")); $statusMap = array(); $canCreate = hasPriv('artifactrepo', 'create'); @@ -53,9 +51,7 @@ dtable set::cols($config->artifactrepo->dtable->fieldList), set::data($artifactRepos), set::onRenderCell(jsRaw('window.renderList')), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('artifactrepo', 'browse', "browseType={$browseType}&orderBy={name}_{sortType}&recTotal={$recTotal}&recPerPage={$recPerPage}")), + set::orderBy($orderBy), set::footPager(usePager()), ); - -render(); - diff --git a/module/branch/js/manage.ui.js b/module/branch/js/manage.ui.js index 6765b10de4..7919d75e26 100644 --- a/module/branch/js/manage.ui.js +++ b/module/branch/js/manage.ui.js @@ -34,13 +34,6 @@ window.checkedChange = function() if(checkedList.length == 2) $('#mergeBranch').show(); } -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - return sortLink.replace('{orderBy}', sort); -} - $(document).on('click', '.batch-btn', function() { const dtable = zui.DTable.query($(this).target); diff --git a/module/compile/js/browse.ui.js b/module/compile/js/browse.ui.js index 6e1c9bfcd4..024004f149 100644 --- a/module/compile/js/browse.ui.js +++ b/module/compile/js/browse.ui.js @@ -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 === 'status') @@ -19,4 +11,4 @@ window.renderCell = function(result, {col, row}) } return result; -}; \ No newline at end of file +}; diff --git a/module/compile/ui/browse.html.php b/module/compile/ui/browse.html.php index 541fdce1d6..59962e1433 100644 --- a/module/compile/ui/browse.html.php +++ b/module/compile/ui/browse.html.php @@ -28,9 +28,6 @@ featureBar /* zin: Define the toolbar on main menu. */ toolbar(); -jsVar('orderBy', $orderBy); -jsVar('sortLink', helper::createLink('compile', 'browse', "repoID=$repoID&jobID={$jobID}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); - $tableData = initTableData($buildList, $config->compile->dtable->fieldList, $this->compile); foreach($tableData as $row) if(!$row->testtask) unset($row->actions[1]); @@ -39,7 +36,8 @@ dtable ( set::cols($config->compile->dtable->fieldList), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('compile', 'browse', "repoID=$repoID&jobID={$jobID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); diff --git a/module/execution/js/common.ui.js b/module/execution/js/common.ui.js index e7eda1544c..4752aeb994 100644 --- a/module/execution/js/common.ui.js +++ b/module/execution/js/common.ui.js @@ -1,10 +1,3 @@ -window.createSortLink = function(col) -{ - let sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - return sortLink.replace('{orderBy}', sort); -} - /** * Compute work days. * diff --git a/module/gitea/js/browse.ui.js b/module/gitea/js/browse.ui.js index 726ae5aa13..3c2f7f682a 100644 --- a/module/gitea/js/browse.ui.js +++ b/module/gitea/js/browse.ui.js @@ -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') diff --git a/module/gitea/ui/browse.html.php b/module/gitea/ui/browse.html.php index 2b85855831..e5825d388f 100644 --- a/module/gitea/ui/browse.html.php +++ b/module/gitea/ui/browse.html.php @@ -27,15 +27,14 @@ toolbar ); jsVar('confirmDelete', $lang->gitea->confirmDelete); -jsVar('orderBy', $orderBy); jsVar('canBrowseProject', common::hasPriv('gitea', 'browseProject')); -jsVar('sortLink', helper::createLink('gitea', 'browse', "orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); dtable ( set::cols(array_values($config->gitea->dtable->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('gitea', 'browse', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); diff --git a/module/gogs/js/browse.ui.js b/module/gogs/js/browse.ui.js index ebbc90b39c..d0199caaa7 100644 --- a/module/gogs/js/browse.ui.js +++ b/module/gogs/js/browse.ui.js @@ -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') diff --git a/module/gogs/ui/browse.html.php b/module/gogs/ui/browse.html.php index c978e855e3..0e32c4ef0d 100644 --- a/module/gogs/ui/browse.html.php +++ b/module/gogs/ui/browse.html.php @@ -27,15 +27,14 @@ toolbar ); jsVar('confirmDelete', $lang->gogs->confirmDelete); -jsVar('orderBy', $orderBy); jsVar('canBrowseProject', common::hasPriv('gogs', 'browseProject')); -jsVar('sortLink', helper::createLink('gogs', 'browse', "orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); dtable ( set::cols(array_values($config->gogs->dtable->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('gogs', 'browse', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); diff --git a/module/host/js/browse.ui.js b/module/host/js/browse.ui.js index 1cd652aa99..5453d6eb8c 100644 --- a/module/host/js/browse.ui.js +++ b/module/host/js/browse.ui.js @@ -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 === 'osVersion') diff --git a/module/host/js/browseimage.ui.js b/module/host/js/browseimage.ui.js index 553021097e..3004088eb8 100644 --- a/module/host/js/browseimage.ui.js +++ b/module/host/js/browseimage.ui.js @@ -1,13 +1,5 @@ var interval; -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 === 'progress') diff --git a/module/host/ui/browse.html.php b/module/host/ui/browse.html.php index 70cc853418..80a2b4671c 100644 --- a/module/host/ui/browse.html.php +++ b/module/host/ui/browse.html.php @@ -12,9 +12,7 @@ declare(strict_types=1); namespace zin; -jsVar('orderBy', $orderBy); -jsVar('hostLang', $lang->host); -jsVar('sortLink', helper::createLink('host', 'browse', "browseType=$browseType¶m=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); +jsVar('hostLang', $lang->host); $config->host->featureBar['all']['active'] = true; $config->host->featureBar['all']['badge'] = $pager->recTotal != '' ? array('text' => $pager->recTotal, 'class' => 'size-sm rounded-full white') : null; @@ -58,7 +56,8 @@ dtable set::userMap($accounts), set::cols(array_values($config->host->dtable->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('host', 'browse', "browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); diff --git a/module/host/ui/browseimage.html.php b/module/host/ui/browseimage.html.php index 6a2c8ed322..97966dbaf9 100644 --- a/module/host/ui/browseimage.html.php +++ b/module/host/ui/browseimage.html.php @@ -12,9 +12,7 @@ declare(strict_types=1); namespace zin; -jsVar('hostID', $hostID); -jsVar('orderBy', $orderBy); -jsVar('sortLink', helper::createLink('host', 'browseImage', "hostID={$hostID}&browseType=$browseType¶m=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); +jsVar('hostID', $hostID); $tableData = initTableData($imageList, $config->host->imageDtable->fieldList); @@ -22,7 +20,8 @@ dtable ( set::cols(array_values($config->host->imageDtable->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('host', 'browseImage', "hostID={$hostID}&browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); diff --git a/module/jenkins/js/browse.ui.js b/module/jenkins/js/browse.ui.js index 76866ec329..6da7ef7e7d 100644 --- a/module/jenkins/js/browse.ui.js +++ b/module/jenkins/js/browse.ui.js @@ -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 === 'url') diff --git a/module/jenkins/ui/browse.html.php b/module/jenkins/ui/browse.html.php index 57fde0dba2..27cfcfcfb8 100644 --- a/module/jenkins/ui/browse.html.php +++ b/module/jenkins/ui/browse.html.php @@ -27,17 +27,14 @@ toolbar ); jsVar('confirmDelete', $lang->jenkins->confirmDelete); -jsVar('orderBy', $orderBy); jsVar('canBrowseProject', common::hasPriv('jenkins', 'browseProject')); -jsVar('sortLink', helper::createLink('jenkins', 'browse', "orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); dtable ( set::cols(array_values($config->jenkins->dtable->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('jenkins', 'browse', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); - -render(); diff --git a/module/job/js/browse.ui.js b/module/job/js/browse.ui.js index 04b529f98b..a2f59daeb3 100644 --- a/module/job/js/browse.ui.js +++ b/module/job/js/browse.ui.js @@ -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 === 'lastStatus') @@ -19,4 +11,4 @@ window.renderCell = function(result, {col, row}) } return result; -}; \ No newline at end of file +}; diff --git a/module/job/ui/browse.html.php b/module/job/ui/browse.html.php index 860f87bb17..ec3daf131e 100644 --- a/module/job/ui/browse.html.php +++ b/module/job/ui/browse.html.php @@ -38,17 +38,14 @@ toolbar ); jsVar('confirmDelete', $lang->job->confirmDelete); -jsVar('orderBy', $orderBy); jsVar('canBrowseProject', common::hasPriv('job', 'browseProject')); -jsVar('sortLink', helper::createLink('job', 'browse', "repoID={$repoID}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); dtable ( set::cols($config->job->dtable->fieldList), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('job', 'browse', "repoID={$repoID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); - -render(); diff --git a/module/mr/control.php b/module/mr/control.php index 80d2a332b0..b79a9a0b61 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -140,7 +140,6 @@ class mr extends control $this->view->orderBy = $orderBy; $this->view->openIDList = $openIDList; $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->sortLink = $this->createLink('mr', 'browse', "repoID={$repoID}&mode={$mode}¶m={$param}&objectID={$objectID}&orderBy={orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}"); $this->display(); } @@ -220,7 +219,6 @@ class mr extends control $this->view->orderBy = $orderBy; $this->view->openIDList = $openIDList; $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->sortLink = $this->createLink('mr', 'browse', "repoID={$repoID}&mode={$mode}¶m={$param}&objectID={$executionID}&orderBy={orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}"); $this->display(); } diff --git a/module/mr/js/common.ui.js b/module/mr/js/common.ui.js deleted file mode 100644 index 6403cb11fd..0000000000 --- a/module/mr/js/common.ui.js +++ /dev/null @@ -1,6 +0,0 @@ -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - return sortLink.replace('{orderBy}', sort); -} diff --git a/module/mr/ui/browse.html.php b/module/mr/ui/browse.html.php index 5038d3cb58..bd53409ebf 100644 --- a/module/mr/ui/browse.html.php +++ b/module/mr/ui/browse.html.php @@ -10,9 +10,6 @@ declare(strict_types=1); */ namespace zin; -jsVar('orderBy', $orderBy); -jsVar('sortLink', $sortLink); - dropmenu(set::objectID($repo->id), set::text($repo->name), set::tab('repo')); foreach($MRList as $MR) @@ -78,7 +75,8 @@ dtable set::userMap($users), set::cols($config->mr->dtable->fieldList), set::data($MRs), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('mr', 'browse', "repoID={$repoID}&mode={$mode}¶m={$param}&objectID={$objectID}&orderBy={name}_{sortType}&recTotal={$recTotal}&recPerPage={$recPerPage}")), + set::orderBy($orderBy), set::footPager(usePager()), ); diff --git a/module/mr/ui/browsebyexecution.html.php b/module/mr/ui/browsebyexecution.html.php index 868b611ba2..8977d560ff 100644 --- a/module/mr/ui/browsebyexecution.html.php +++ b/module/mr/ui/browsebyexecution.html.php @@ -10,9 +10,6 @@ declare(strict_types=1); */ namespace zin; -jsVar('orderBy', $orderBy); -jsVar('sortLink', $sortLink); - dropmenu ( set::url(createLink('execution', 'ajaxGetDropMenu', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) @@ -113,7 +110,8 @@ dtable set::userMap($users), set::cols($config->mr->dtable->fieldList), set::data($MRs), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('mr', 'browse', "repoID={$repoID}&mode={$mode}¶m={$param}&objectID={$executionID}&orderBy={name}_{sortType}&recTotal={$recTotal}&recPerPage={$recPerPage}")), + set::orderBy($orderBy), set::footPager(usePager()), ); diff --git a/module/project/js/common.ui.js b/module/project/js/common.ui.js index 2bddb45749..12df0361a2 100644 --- a/module/project/js/common.ui.js +++ b/module/project/js/common.ui.js @@ -206,13 +206,6 @@ function convertStringToDate(dateString) return new Date(dateString[0], dateString[1] - 1, dateString[2]); } -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - return sortLink.replace('{orderBy}', sort); -} - /** * 提示并删除项目。 * Delete project with tips. diff --git a/module/release/js/browse.ui.js b/module/release/js/browse.ui.js index e043fd7d73..5144620e79 100644 --- a/module/release/js/browse.ui.js +++ b/module/release/js/browse.ui.js @@ -31,13 +31,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); -} - /** * 合并单元格。 * cell span in the column. diff --git a/module/repo/js/maintain.ui.js b/module/repo/js/maintain.ui.js deleted file mode 100644 index 0cd4883f31..0000000000 --- a/module/repo/js/maintain.ui.js +++ /dev/null @@ -1,7 +0,0 @@ -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - - return sortLink.replace('{orderBy}', sort); -}; \ No newline at end of file diff --git a/module/repo/ui/maintain.html.php b/module/repo/ui/maintain.html.php index b2188b091c..6b8d6fb779 100644 --- a/module/repo/ui/maintain.html.php +++ b/module/repo/ui/maintain.html.php @@ -10,9 +10,6 @@ declare(strict_types=1); */ namespace zin; -jsVar('orderBy', $orderBy); -jsVar('sortLink', createLink('repo', 'maintain', "objectID=$objectID&orderBy={orderBy}&recTotal={$pager->recTotal}&pageID={$pager->pageID}")); - $createItem = array('text' => $lang->repo->createAction, 'url' => createLink('repo', 'create')); $createRepoItem = array('text' => $lang->repo->createRepoAction, 'url' => createLink('repo', 'createRepo')); $batchCreateItem = array('text' => $lang->repo->batchCreate, 'url' => createLink('repo', 'import')); @@ -103,7 +100,8 @@ dtable ( set::cols($config->repo->dtable->fieldList), set::data($repos), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('repo', 'maintain', "objectID=$objectID&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::footPager(usePager()) ); diff --git a/module/repo/ui/review.html.php b/module/repo/ui/review.html.php index ce3d70e380..0986ae59ae 100644 --- a/module/repo/ui/review.html.php +++ b/module/repo/ui/review.html.php @@ -58,6 +58,7 @@ dtable set::cols($config->repo->reviewDtable->fieldList), set::data($bugs), set::sortLink(jsRaw('createSortLink')), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderRepobugList')), set::footPager(usePager()), ); diff --git a/module/serverroom/js/browse.ui.js b/module/serverroom/js/browse.ui.js deleted file mode 100644 index f0c0aba9d3..0000000000 --- a/module/serverroom/js/browse.ui.js +++ /dev/null @@ -1,7 +0,0 @@ -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - - return sortLink.replace('{orderBy}', sort); -} \ No newline at end of file diff --git a/module/serverroom/ui/browse.html.php b/module/serverroom/ui/browse.html.php index b415f4fa1d..9ff888be3c 100644 --- a/module/serverroom/ui/browse.html.php +++ b/module/serverroom/ui/browse.html.php @@ -31,15 +31,13 @@ toolbar $canCreate ? item(set($createItem)) : null, ); -jsVar('orderBy', $orderBy); -jsVar('sortLink', helper::createLink('serverroom', 'browse', "browseType=$browseType¶m=$param&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); - dtable ( set::userMap($users), set::cols(array_values($config->serverroom->dtable->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('serverroom', 'browse', "browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")), + set::orderBy($orderBy), set::footPager(usePager()), ); diff --git a/module/sonarqube/js/browse.ui.js b/module/sonarqube/js/browse.ui.js index 76866ec329..6da7ef7e7d 100644 --- a/module/sonarqube/js/browse.ui.js +++ b/module/sonarqube/js/browse.ui.js @@ -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 === 'url') diff --git a/module/sonarqube/ui/browse.html.php b/module/sonarqube/ui/browse.html.php index 44fc170eb6..d308605a6f 100644 --- a/module/sonarqube/ui/browse.html.php +++ b/module/sonarqube/ui/browse.html.php @@ -27,15 +27,14 @@ toolbar ); jsVar('confirmDelete', $lang->sonarqube->confirmDelete); -jsVar('orderBy', $orderBy); jsVar('canBrowseProject', common::hasPriv('sonarqube', 'browseProject')); -jsVar('sortLink', helper::createLink('sonarqube', 'browse', "orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); dtable ( set::cols(array_values($config->sonarqube->dtable->browse->fieldList)), set::data($tableData), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(reateLink('sonarqube', 'browse', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"))), + set::orderBy($orderBy), set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), ); diff --git a/module/space/control.php b/module/space/control.php index e77a689f91..19307c74fb 100644 --- a/module/space/control.php +++ b/module/space/control.php @@ -103,7 +103,6 @@ class space extends control $this->view->currentSpace = $space; $this->view->searchName = $search; $this->view->users = $this->loadModel('user')->getPairs('noclosed,noletter'); - $this->view->sortLink = $this->createLink('space', 'browse', "spaceID=&browseType={$browseType}&orderBy={orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}"); $this->display(); } diff --git a/module/space/js/browse.ui.js b/module/space/js/browse.ui.js index 85622b93cc..b641eb6b7c 100644 --- a/module/space/js/browse.ui.js +++ b/module/space/js/browse.ui.js @@ -99,10 +99,3 @@ window.editApp = function(externalID, appName) } $('#editLinkContainer').trigger('click'); } - -window.createSortLink = function(col) -{ - var sort = col.name + '_asc'; - if(sort == orderBy) sort = col.name + '_desc'; - return sortLink.replace('{orderBy}', sort); -} diff --git a/module/space/ui/browse.html.php b/module/space/ui/browse.html.php index 524fe42419..9ae9d03d1d 100644 --- a/module/space/ui/browse.html.php +++ b/module/space/ui/browse.html.php @@ -10,9 +10,6 @@ declare(strict_types=1); */ namespace zin; -jsVar('orderBy', $orderBy); -jsVar('sortLink', $sortLink); - h::importCss($app->getWebRoot() . 'js/xterm/xterm.css'); h::importJs($app->getWebRoot() . 'js/xterm/xterm.js'); @@ -66,7 +63,8 @@ dtable set::cols($config->space->dtable->fieldList), set::data($instances), set::onRenderCell(jsRaw('window.renderInstanceList')), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('space', 'browse', "spaceID=&browseType={$browseType}&orderBy={name}_{sortType}&recTotal={$recTotal}&recPerPage={$recPerPage}")), + set::orderBys($orderBy), set::footPager(usePager()), ); diff --git a/module/zahost/control.php b/module/zahost/control.php index 4b6438c111..362862d2fa 100644 --- a/module/zahost/control.php +++ b/module/zahost/control.php @@ -60,7 +60,6 @@ class zahost extends control $this->view->orderBy = $orderBy; $this->view->browseType = $browseType; $this->view->showFeature = $showFeature; - $this->view->sortLink = $this->createLink('zahost', 'browse', "browseType={$browseType}¶m={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"); $this->display(); } @@ -221,7 +220,6 @@ class zahost extends control $this->view->param = $param; $this->view->orderBy = $orderBy; $this->view->browseType = $browseType; - $this->view->sortLink = $this->createLink('zahost', 'browseImage', "hostID={$hostID}&browseType={$browseType}¶m={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"); $this->display(); } diff --git a/module/zahost/js/browse.ui.js b/module/zahost/js/browse.ui.js index f72a8757c7..6d8c4b2c5e 100644 --- a/module/zahost/js/browse.ui.js +++ b/module/zahost/js/browse.ui.js @@ -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.renderList = function (result, {col, row, value}) { if(col.name === 'status') diff --git a/module/zahost/ui/browse.html.php b/module/zahost/ui/browse.html.php index aa6765fe5e..765b96cc41 100644 --- a/module/zahost/ui/browse.html.php +++ b/module/zahost/ui/browse.html.php @@ -10,8 +10,6 @@ declare(strict_types=1); */ namespace zin; -jsVar('orderBy', $orderBy); -jsVar('sortLink', $sortLink); jsVar('webRoot', getWebRoot()); jsVar('undeletedNotice', $lang->zahost->undeletedNotice); jsVar('uninitNotice', $lang->zahost->uninitNotice); @@ -52,7 +50,7 @@ dtable set::data($hostList), set::onRenderCell(jsRaw('window.renderList')), set::afterRender(jsRaw('window.afterRender')), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('zahost', 'browse', "browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footPager(usePager()), set::orderBy(str_replace('id_', 'hostID_', $orderBy)), ); diff --git a/module/zahost/ui/browseimage.html.php b/module/zahost/ui/browseimage.html.php index 42490e522e..3e4b9409b9 100644 --- a/module/zahost/ui/browseimage.html.php +++ b/module/zahost/ui/browseimage.html.php @@ -11,13 +11,8 @@ declare(strict_types=1); namespace zin; jsVar('hostID', $hostID); -jsVar('orderBy', $orderBy); -jsVar('sortLink', $sortLink); -foreach($imageList as $image) -{ - $image->hostID = $hostID; -} +foreach($imageList as $image) $image->hostID = $hostID; $imageList = initTableData($imageList, $config->zahost->imageDtable->fieldList, $this->zahost); @@ -27,10 +22,7 @@ dtable ( set::cols($config->zahost->imageDtable->fieldList), set::data($imageList), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('zahost', 'browseImage', "hostID={$hostID}&browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footPager(usePager()), set::orderBy($orderBy) ); - -render(); - diff --git a/module/zanode/control.php b/module/zanode/control.php index 88bcd3cc68..566ffb6cb5 100644 --- a/module/zanode/control.php +++ b/module/zanode/control.php @@ -60,7 +60,6 @@ class zanode extends control $this->view->orderBy = $orderBy; $this->view->browseType = $browseType; $this->view->showFeature = $showFeature; - $this->view->sortLink = $this->createLink('zanode', 'browse', "browseType={$browseType}¶m={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"); $this->display(); } diff --git a/module/zanode/js/browse.ui.js b/module/zanode/js/browse.ui.js index 35f1ed8926..6d21ff4384 100644 --- a/module/zanode/js/browse.ui.js +++ b/module/zanode/js/browse.ui.js @@ -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.renderList = function (result, {col, row, value}) { if(col.name === 'status') diff --git a/module/zanode/ui/browse.html.php b/module/zanode/ui/browse.html.php index 39c9e5ad8e..bd15a42c1f 100644 --- a/module/zanode/ui/browse.html.php +++ b/module/zanode/ui/browse.html.php @@ -10,9 +10,6 @@ declare(strict_types=1); */ namespace zin; -jsVar('orderBy', $orderBy); -jsVar('sortLink', $sortLink); - $createItem = array('text' => $lang->zanode->create, 'url' => createLink('zanode', 'create'), 'icon' => 'plus', 'class' => 'btn primary'); foreach($nodeList as $node) @@ -47,7 +44,8 @@ dtable set::data($nodeList), set::onRenderCell(jsRaw('window.renderList')), set::afterRender(jsRaw('window.afterRender')), - set::sortLink(jsRaw('createSortLink')), + set::sortLink(createLink('zanode', 'browse', "browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::footPager(usePager()), set::orderBy(str_replace('t1.', '', $orderBy)), );