diff --git a/module/my/ui/audit.html.php b/module/my/ui/audit.html.php
index b84369fe05..dcb34e87f9 100644
--- a/module/my/ui/audit.html.php
+++ b/module/my/ui/audit.html.php
@@ -83,6 +83,7 @@ foreach($reviewList as $review)
}
$reviewList = initTableData($reviewList, $config->my->audit->dtable->fieldList, $this->my);
+$sortLink = $app->rawMethod == 'audit' ? createLink('my', 'audit', "browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}") : createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}");
$cols = array_values($config->my->audit->dtable->fieldList);
$data = array_values($reviewList);
@@ -93,7 +94,7 @@ dtable
set::data($data),
set::onRenderCell(jsRaw('window.onRenderCell')),
set::orderBy($orderBy),
- set::sortLink(createLink('my', 'audit', "browseType={$browseType}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
+ set::sortLink($sortLink),
set::footPager(usePager()),
);
diff --git a/module/my/ui/bug.html.php b/module/my/ui/bug.html.php
index 0cb0fdb8c1..d549a80771 100644
--- a/module/my/ui/bug.html.php
+++ b/module/my/ui/bug.html.php
@@ -77,7 +77,7 @@ dtable
set::checkable($canBatchAction),
set::canRowCheckable(jsRaw('function(rowID){return this.getRowInfo(rowID).data.canBeChanged;}')),
set::orderBy($orderBy),
- set::sortLink(createLink('my', 'work', "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
+ set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footToolbar($footToolbar),
set::footPager(usePager()),
);
diff --git a/module/my/ui/requirement.html.php b/module/my/ui/requirement.html.php
index 9568af877f..dc8bb106e5 100644
--- a/module/my/ui/requirement.html.php
+++ b/module/my/ui/requirement.html.php
@@ -79,7 +79,7 @@ dtable
set::checkable($canBatchAction ? true : false),
set::onRenderCell(jsRaw('window.renderCell')),
set::orderBy($orderBy),
- set::sortLink(createLink('my', 'work', "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
+ set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footToolbar($footToolbar),
set::footPager(usePager()),
);
diff --git a/module/my/ui/story.html.php b/module/my/ui/story.html.php
index c1c8a992f5..2247a7ae09 100644
--- a/module/my/ui/story.html.php
+++ b/module/my/ui/story.html.php
@@ -81,7 +81,7 @@ dtable
set::checkable($canBatchAction ? true : false),
set::onRenderCell(jsRaw('window.renderCell')),
set::orderBy($orderBy),
- set::sortLink(createLink('my', 'work', "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
+ set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footToolbar($footToolbar),
set::footPager(usePager()),
);
diff --git a/module/my/ui/task.html.php b/module/my/ui/task.html.php
index a3f2add808..225acbc537 100644
--- a/module/my/ui/task.html.php
+++ b/module/my/ui/task.html.php
@@ -48,7 +48,7 @@ dtable
set::checkedSummary($lang->execution->checkedSummary),
set::checkInfo(jsRaw('function(checkedIDList){return window.setStatistics(this, checkedIDList);}')),
set::orderBy($orderBy),
- set::sortLink(createLink('my', 'work', "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
+ set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footToolbar($footToolbar),
set::footPager(usePager()),
);
diff --git a/module/my/ui/testcase.html.php b/module/my/ui/testcase.html.php
index d1827c0b21..072ab796d2 100644
--- a/module/my/ui/testcase.html.php
+++ b/module/my/ui/testcase.html.php
@@ -47,7 +47,7 @@ dtable
set::checkedSummary($lang->testcase->failCheckedSummary),
set::checkInfo(jsRaw('function(checkedIDList){return window.setStatistics(this, checkedIDList);}')),
set::orderBy($orderBy),
- set::sortLink(createLink('my', 'work', "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
+ set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footToolbar($footToolbar),
set::footPager(usePager()),
);
diff --git a/module/my/ui/testtask.html.php b/module/my/ui/testtask.html.php
index 39e13fe17c..bd0c33639c 100644
--- a/module/my/ui/testtask.html.php
+++ b/module/my/ui/testtask.html.php
@@ -26,7 +26,7 @@ dtable
set::data($data),
set::fixedLeftWidth('20%'),
set::orderBy($orderBy),
- set::sortLink(createLink('my', 'work', "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
+ set::sortLink(createLink('my', $app->rawMethod, "mode={$mode}&type={$type}¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::footer(array(array('html' => $footerHTML), 'flex', 'pager')),
set::footPager(usePager()),
);