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

Fix incorrect redirect when loading saved document from another module #2659

Browse source
This commit is contained in:
Kijin Sung 2026-01-28 21:04:12 +09:00
parent f051b58e09
commit 70a25057f0
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/js/common.js
View file

@ -1580,9 +1580,10 @@ function doDocumentLoad(obj) {
* *
* @param int document_srl * @param int document_srl
* @param string module * @param string module
* @param string mid
* @return void * @return void
*/ */
function doDocumentSelect(document_srl, module) { function doDocumentSelect(document_srl, module, mid) {
if (!opener) { if (!opener) {
window.close(); window.close();
return; return;
@ -1590,6 +1591,9 @@ function doDocumentSelect(document_srl, module) {
if (module === undefined) { if (module === undefined) {
module = 'document'; module = 'document';
} }
if (mid === undefined) {
mid = current_mid;
}
// 게시글을 가져와서 등록하기 // 게시글을 가져와서 등록하기
if (module === 'page') { if (module === 'page') {
@ -1602,7 +1606,7 @@ function doDocumentSelect(document_srl, module) {
} }
opener.location.href = url; opener.location.href = url;
} else { } else {
opener.location.href = opener.current_url.setQuery('act', 'dispBoardWrite').setQuery('document_srl', document_srl); opener.location.href = opener.current_url.setQuery('mid', mid).setQuery('act', 'dispBoardWrite').setQuery('document_srl', document_srl);
} }
// 딜레이 후 창 닫기 // 딜레이 후 창 닫기

7
modules/document/tpl/saved_list_popup.html
View file

@ -11,6 +11,7 @@
<thead> <thead>
<tr> <tr>
<th class="title">{$lang->title}</th> <th class="title">{$lang->title}</th>
<th class="title">{$lang->module}</th>
<th class="title">{$lang->date}</th> <th class="title">{$lang->date}</th>
<th class="title" style="width:60px">{$lang->cmd_select}</th> <th class="title" style="width:60px">{$lang->cmd_select}</th>
<th class="title" style="width:60px">{$lang->cmd_delete}</th> <th class="title" style="width:60px">{$lang->cmd_delete}</th>
@ -22,8 +23,9 @@
<td> <td>
<a href="#" class="toggle_content" data-document-srl="{$val->document_srl}">{$val->getTitle()}</a> <a href="#" class="toggle_content" data-document-srl="{$val->document_srl}">{$val->getTitle()}</a>
</td> </td>
<td>{$val->getModuleName()}</td>
<td>{$val->getRegdate("Y-m-d H:i:s")}</td> <td>{$val->getRegdate("Y-m-d H:i:s")}</td>
<td><a href="#" class="btn btn_select_temp_saved" data-document-srl="{$val->document_srl}" data-document-type="{$val->getDocumentType()}">{$lang->cmd_select}</a></td> <td><a href="#" class="btn btn_select_temp_saved" data-document-srl="{$val->document_srl}" data-document-type="{$val->getDocumentType()}" data-document-mid="{$val->getDocumentMid()}">{$lang->cmd_select}</a></td>
<td><a href="#" class="btn btn_delete_temp_saved" data-document-srl="{$val->document_srl}">{$lang->cmd_delete}</a></td> <td><a href="#" class="btn btn_delete_temp_saved" data-document-srl="{$val->document_srl}">{$lang->cmd_delete}</a></td>
</tr> </tr>
<tr id="saved_document_{$val->document_srl}" class="saved_content" style="display:none"> <tr id="saved_document_{$val->document_srl}" class="saved_content" style="display:none">
@ -61,7 +63,8 @@
event.preventDefault(); event.preventDefault();
var document_srl = $(this).data('documentSrl'); var document_srl = $(this).data('documentSrl');
var document_type = $(this).data('documentType'); var document_type = $(this).data('documentType');
doDocumentSelect(document_srl, document_type); var document_mid = $(this).data('documentMid');
doDocumentSelect(document_srl, document_type, document_mid);
}); });
$('.btn_delete_temp_saved').on('click', function(event) { $('.btn_delete_temp_saved').on('click', function(event) {
event.preventDefault(); event.preventDefault();