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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-03 14:04:20 +09:00
commit 818897fed4
8 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -737,7 +737,7 @@ class boardController extends board
}
$url = getUrl('', 'mid', $mid, 'member_srl', $obj->member_srl);
getController('member')->addMemberPopupMenu($url, 'cmd_view_own_document', '');
getController('member')->addMemberPopupMenu($url, 'cmd_view_own_document', '', 'self', 'board_own_document');
}
/**

12
modules/board/board.view.php
View file

@ -1216,9 +1216,19 @@ class boardView extends board
{
throw new Rhymix\Framework\Exceptions\NotPermitted;
}
$document_srl = Context::get('document_srl');
if(!$document_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$updatelog = DocumentModel::getDocumentUpdateLog($document_srl);
if(!$updatelog->toBool())
{
return $updatelog;
}
Context::set('total_count', $updatelog->page_navigation->total_count);
Context::set('total_page', $updatelog->page_navigation->total_page);
Context::set('page', $updatelog->page);