fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Preserve 'isvalid' URL parameter when changing sort order or after deleting files

Browse source
This commit is contained in:
Kijin Sung 2022-12-20 01:02:02 +09:00
parent 21fb1d9e76
commit 8b6e1949b0
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/file/file.admin.controller.php
View file

@ -49,7 +49,13 @@ class fileAdminController extends file
}
$this->setMessage(sprintf(lang('msg_checked_file_is_deleted'), $file_count));
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList'));
$redirect_url = $_SERVER['HTTP_REFERER'] ?? '';
if (!$redirect_url || !Rhymix\Framework\URL::isInternalURL($redirect_url))
{
$redirect_url = Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
}
$this->setRedirectUrl($redirect_url);
}
/**

6
modules/file/tpl/file_list.html
View file

@ -24,7 +24,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<tr>
<th scope="col">{$lang->file}</th>
<th scope="col" class="nowr">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList', 'sort_index', 'file_size', 'order_type', ($order_type == 'desc' && $sort_index == 'file_size') ? 'asc' : 'desc')}">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList', 'sort_index', 'file_size', 'order_type', ($order_type == 'desc' && $sort_index == 'file_size') ? 'asc' : 'desc', 'isvalid', $isvalid ?? null)}">
{$lang->file_size}
<block cond="$sort_index == 'file_size'">
<em cond="$order_type=='asc'">▲</em><em cond="$order_type != 'asc'">▼</em>
@ -32,7 +32,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</a>
</th>
<th scope="col" class="nowr">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList', 'sort_index', 'download_count', 'order_type', ($order_type == 'desc' && $sort_index == 'download_count') ? 'asc' : 'desc')}">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList', 'sort_index', 'download_count', 'order_type', ($order_type == 'desc' && $sort_index == 'download_count') ? 'asc' : 'desc', 'isvalid', $isvalid ?? null)}">
{$lang->cmd_download}
<block cond="$sort_index == 'download_count'">
<em cond="$order_type=='asc'">▲</em><em cond="$order_type != 'asc'">▼</em>
@ -41,7 +41,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</th>
<th scope="col" class="nowr">{$lang->author}</th>
<th scope="col" class="nowr">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList', 'sort_index', 'regdate', 'order_type', ($order_type == 'desc' && $sort_index == 'regdate') ? 'asc' : 'desc')}">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList', 'sort_index', 'regdate', 'order_type', ($order_type == 'desc' && $sort_index == 'regdate') ? 'asc' : 'desc', 'isvalid', $isvalid ?? null)}">
{$lang->date}
<block cond="$sort_index == 'regdate'">
<em cond="$order_type=='asc'">▲</em><em cond="$order_type != 'asc'">▼</em>