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

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2026-01-08 20:28:49 -08:00 • committed by GitHub
commit 2efe733d5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 67 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/document/document.controller.php
View file

@ -894,7 +894,7 @@ class DocumentController extends Document
if (!$manual_inserted)
{
$ev_output = $extra_item->validate($value);
if ($ev_output && !$output->toBool())
if ($ev_output && !$ev_output->toBool())
{
$oDB->rollback();
return $ev_output;

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

@ -11,6 +11,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="page" value="{$page}" />
<table id="documentListTable" class="x_table x_table-striped x_table-hover dsTg">
<caption>
<a href="{getUrl('search_target', $search_target, 'search_keyword', $search_keyword)}" cond="!empty($search_target) && $search_target !== 'is_secret' && !empty($search_keyword)" class="active">{$lang->cmd_search}({number_format($total_count)})</a>
<i>|</i>
<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}" class="active"|cond="$search_keyword == ''">{$lang->all}<block cond="$search_keyword == ''">({number_format($total_count)})</block></a>
<i>|</i>
<a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'N')}" class="active"|cond="$search_target == 'is_secret' && $search_keyword == 'N'">{$status_name_list['PUBLIC']}<block cond="$search_target == 'is_secret' && $search_keyword == 'N'">({number_format($total_count)})</block></a>

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

@ -10,8 +10,8 @@
<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
<thead>
<tr>
<th class="title">{$lang->date}</th>
<th class="title">{$lang->title}</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_delete}</th>
</tr>
@ -19,14 +19,18 @@
<tbody>
<!--@foreach($document_list as $no => $val)-->
<tr>
<td>{$val->getRegdate("Y-m-d H:i:s")}</td>
<td>
<a href="#" class="toggle_content">{$val->getTitle()}</a>
<div id="saved_document_{$val->document_srl}" class="saved_content" style="display:none;margin:20px -120px 0 0">{$val->getContent(false)}</div>
<a href="#" class="toggle_content" data-document-srl="{$val->document_srl}">{$val->getTitle()}</a>
</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_delete_temp_saved" data-document-srl="{$val->document_srl}">{$lang->cmd_delete}</a></td>
</tr>
<tr id="saved_document_{$val->document_srl}" class="saved_content" style="display:none">
<td colspan="4">
{$val->getSummary(200)}
</td>
</tr>
<!--@end-->
</tbody>
</table>
@ -49,7 +53,8 @@
$(function() {
$('.toggle_content').on('click', function(event) {
event.preventDefault();
$(this).next('.saved_content').toggle();
var document_srl = $(this).data('documentSrl');
$('#saved_document_' + document_srl).toggle();
setFixedPopupSize();
});
$('.btn_select_temp_saved').on('click', function(event) {