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

Fix #2072 redirect to proper URL if a document with is_notice=A is requested without mid

Browse source
This commit is contained in:
Kijin Sung 2023-03-23 22:44:47 +09:00
parent c6523706f8
commit 87a34af69e
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
classes/module/ModuleHandler.class.php
View file

@ -733,7 +733,12 @@ class ModuleHandler extends Handler
/** /**
* Check the value of $document_srl. This method is called during init(). * Check the value of $document_srl. This method is called during init().
* *
* @return object|false * This method returns:
* - Module info object if the document can be shown in the module,
* - null if the document can be shown but the module is unspecified,
* - false if we should redirect to another module.
*
* @return object|null|false
*/ */
protected function _checkDocumentSrl() protected function _checkDocumentSrl()
{ {
@ -745,7 +750,7 @@ class ModuleHandler extends Handler
if(!$this->mid || $this->mid !== $module_info->mid) if(!$this->mid || $this->mid !== $module_info->mid)
{ {
// If the document is notice-all, preserve the current mid. // If the document is notice-all, preserve the current mid.
if($module_info->is_notice === 'A') if($module_info->is_notice === 'A' && !empty($this->mid))
{ {
return null; return null;
} }

10
modules/document/tpl/document_list.html
View file

@ -18,7 +18,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<i>|</i> <i>|</i>
<a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}" class="active"|cond="$search_target == 'is_secret' && $search_keyword == 'Y'">{$status_name_list['SECRET']}<block cond="$search_target == 'is_secret' && $search_keyword == 'Y'">({number_format($total_count)})</block></a> <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}" class="active"|cond="$search_target == 'is_secret' && $search_keyword == 'Y'">{$status_name_list['SECRET']}<block cond="$search_target == 'is_secret' && $search_keyword == 'Y'">({number_format($total_count)})</block></a>
<i>|</i> <i>|</i>
<a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}" class="active"|cond="$search_target == 'is_secret' && $search_keyword == 'temp'">{$status_name_list['TEMP']}<block cond="$search_target == 'is_secret' && $search_keyword == 'temp'">({number_format($total_count)})</block></a> <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}" class="active"|cond="$search_target == 'is_secret' && $search_keyword == 'temp'">{$status_name_list['TEMP']}<block cond="$search_target == 'is_secret' && $search_keyword == 'temp'">({number_format($total_count)})</block></a>
<i>|</i> <i>|</i>
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a> <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a>
<i cond="$search_target == 'ipaddress'">|</i> <i cond="$search_target == 'ipaddress'">|</i>
@ -33,7 +33,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<div class="x_pull-right x_btn-group margin_after"> <div class="x_pull-right x_btn-group margin_after">
<button type="button" class="x_btn x_active __simple">{$lang->simple_view}</button> <button type="button" class="x_btn x_active __simple">{$lang->simple_view}</button>
<button type="button" class="x_btn __detail">{$lang->detail_view}</button> <button type="button" class="x_btn __detail">{$lang->detail_view}</button>
</div> </div>
</caption> </caption>
<thead> <thead>
<tr> <tr>
@ -51,8 +51,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<tr loop="$document_list => $no, $oDocument"> <tr loop="$document_list => $no, $oDocument">
<td class="title"> <td class="title">
<a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank"><!--@if(trim($oDocument->getTitleText()) !== '')-->{escape($oDocument->getTitleText(), false)}<!--@else--><em>{$lang->no_title_document}</em><!--@end--></a> <a href="{$oDocument->getPermanentUrl()}" target="_blank"><!--@if(trim($oDocument->getTitleText()) !== '')-->{escape($oDocument->getTitleText(), false)}<!--@else--><em>{$lang->no_title_document}</em><!--@end--></a>
<span cond="isset($module_list[$oDocument->get('module_srl')])"> <span cond="isset($module_list[$oDocument->get('module_srl')])">
- <a href="{getUrl('', 'mid', $module_list[$oDocument->get('module_srl')]->mid)}" target="_blank">{$module_list[$oDocument->get('module_srl')]->browser_title}</a> - <a href="{getUrl('', 'mid', $module_list[$oDocument->get('module_srl')]->mid)}" target="_blank">{$module_list[$oDocument->get('module_srl')]->browser_title}</a>
</span></td> </span></td>
@ -205,7 +205,7 @@ jQuery(function($){
$modalBody.removeClass('showTree'); $modalBody.removeClass('showTree');
} else if(thisValue == 'move' || thisValue == 'copy') { } else if(thisValue == 'move' || thisValue == 'copy') {
$.xeShowMenuSelectorIn($('._menuSelector')); $.xeShowMenuSelectorIn($('._menuSelector'));
$modalBody.addClass('showTree'); $modalBody.addClass('showTree');
$tree = $('._menuSelector .tree'); $tree = $('._menuSelector .tree');
$tree.bind('select_node.jstree', function(a,b){ $tree.bind('select_node.jstree', function(a,b){