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

* Adjust dtable sort params.

Browse Source
This commit is contained in:
caoyanyi
2023-11-10 15:02:33 +08:00
parent 40bf09729b
commit 6ea6983436
43 changed files with 40 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/account/js/browse.ui.js
-7
View File
@@ -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);
}
module/account/ui/browse.html.php
+2 -4
View File
@@ -31,15 +31,13 @@ toolbar
$canCreate ? item(set($createItem)) : null,
);
jsVar('orderBy', $orderBy);
jsVar('sortLink', helper::createLink('account', 'browse', "browseType=$browseType&param=$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&param=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
set::footPager(usePager()),
);
module/artifactrepo/js/browse.ui.js
-7
View File
@@ -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')
module/artifactrepo/ui/browse.html.php
+2 -6
View File
@@ -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();
module/branch/js/manage.ui.js
-7
View File
@@ -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);
module/compile/js/browse.ui.js
+1 -9
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 === 'status')
@@ -19,4 +11,4 @@ window.renderCell = function(result, {col, row})
}
return result;
};
};
module/compile/ui/browse.html.php
+2 -4
View File
@@ -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()),
);
module/execution/js/common.ui.js
-7
View File
@@ -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.
*
module/gitea/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/gitea/ui/browse.html.php
+2 -3
View File
@@ -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()),
);
module/gogs/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/gogs/ui/browse.html.php
+2 -3
View File
@@ -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()),
);
module/host/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 === 'osVersion')
module/host/js/browseimage.ui.js
-8
View File
@@ -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')
module/host/ui/browse.html.php
+3 -4
View File
@@ -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&param=$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&param=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
set::onRenderCell(jsRaw('window.renderCell')),
set::footPager(usePager()),
);
module/host/ui/browseimage.html.php
+3 -4
View File
@@ -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&param=$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&param=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
set::onRenderCell(jsRaw('window.renderCell')),
set::footPager(usePager()),
);
module/jenkins/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 === 'url')
module/jenkins/ui/browse.html.php
+2 -5
View File
@@ -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();
module/job/js/browse.ui.js
+1 -9
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 === 'lastStatus')
@@ -19,4 +11,4 @@ window.renderCell = function(result, {col, row})
}
return result;
};
};
module/job/ui/browse.html.php
+2 -5
View File
@@ -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();
module/mr/control.php
-2
View File
@@ -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}&param={$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}&param={$param}&objectID={$executionID}&orderBy={orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}");
$this->display();
}
module/mr/js/common.ui.js
-6
View File
@@ -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);
}
module/mr/ui/browse.html.php
+2 -4
View File
@@ -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}&param={$param}&objectID={$objectID}&orderBy={name}_{sortType}&recTotal={$recTotal}&recPerPage={$recPerPage}")),
set::orderBy($orderBy),
set::footPager(usePager()),
);
module/mr/ui/browsebyexecution.html.php
+2 -4
View File
@@ -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}&param={$param}&objectID={$executionID}&orderBy={name}_{sortType}&recTotal={$recTotal}&recPerPage={$recPerPage}")),
set::orderBy($orderBy),
set::footPager(usePager()),
);
module/project/js/common.ui.js
-7
View File
@@ -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.
module/release/js/browse.ui.js
-7
View File
@@ -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.
module/repo/js/maintain.ui.js
-7
View File
@@ -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);
};
module/repo/ui/maintain.html.php
+2 -4
View File
@@ -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())
);
module/repo/ui/review.html.php
+1
View File
@@ -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()),
);
module/serverroom/js/browse.ui.js
-7
View File
@@ -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);
}
module/serverroom/ui/browse.html.php
+2 -4
View File
@@ -31,15 +31,13 @@ toolbar
$canCreate ? item(set($createItem)) : null,
);
jsVar('orderBy', $orderBy);
jsVar('sortLink', helper::createLink('serverroom', 'browse', "browseType=$browseType&param=$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&param=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
set::footPager(usePager()),
);
module/sonarqube/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 === 'url')
module/sonarqube/ui/browse.html.php
+2 -3
View File
@@ -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()),
);
module/space/control.php
-1
View File
@@ -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();
}
module/space/js/browse.ui.js
-7
View File
@@ -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);
}
module/space/ui/browse.html.php
+2 -4
View File
@@ -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()),
);
module/zahost/control.php
-2
View File
@@ -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}&param={$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}&param={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}");
$this->display();
}
module/zahost/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.renderList = function (result, {col, row, value})
{
if(col.name === 'status')
module/zahost/ui/browse.html.php
+1 -3
View File
@@ -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}&param={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footPager(usePager()),
set::orderBy(str_replace('id_', 'hostID_', $orderBy)),
);
module/zahost/ui/browseimage.html.php
+2 -10
View File
@@ -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}&param={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footPager(usePager()),
set::orderBy($orderBy)
);
render();
module/zanode/control.php
-1
View File
@@ -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}&param={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}");
$this->display();
}
module/zanode/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.renderList = function (result, {col, row, value})
{
if(col.name === 'status')
module/zanode/ui/browse.html.php
+2 -4
View File
@@ -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}&param={$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)),
);