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

Fix new scraps not going to default folder

Browse source
This commit is contained in:
Kijin Sung 2024-03-23 13:27:24 +09:00
parent a56734d4f5
commit c53dab4805
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/member/member.controller.php
View file

@ -207,7 +207,15 @@ class MemberController extends Member
}
else
{
$default_folder_srl = null;
$output = $this->migrateMemberScrappedDocuments($logged_info->member_srl);
if ($output instanceof BaseObject)
{
return $output;
}
else
{
$default_folder_srl = $output;
}
}
// Variables
@ -468,7 +476,7 @@ class MemberController extends Member
* Migrate a member's scrapped documents to the new folder system.
*
* @param int $member_srl
* @return void|Object (void : success, Object : fail)
* @return int|BaseObject
*/
function migrateMemberScrappedDocuments($member_srl)
{
@ -487,6 +495,8 @@ class MemberController extends Member
{
return $output;
}
return $args->folder_srl;
}
/**

9
modules/member/member.view.php
View file

@ -671,6 +671,15 @@ class MemberView extends Member
}
}
// If viewing default folder, check for additional scraps to migrate.
if (isset($folder_info->folder_srl) && $folder_info->name === '/DEFAULT/')
{
$output = executeQuery('member.updateScrapFolderFromNull', [
'folder_srl' => $folder_info->folder_srl,
'member_srl' => $logged_info->member_srl,
]);
}
// Get scrapped documents in selected folder
$args = new stdClass();
$args->member_srl = $logged_info->member_srl;

7
modules/member/queries/updateScrapFolderFromNull.xml
View file

@ -7,6 +7,9 @@
</columns>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" filter="number" notnull="notnull" />
<condition operation="null" column="folder_srl" pipe="and" />
<group>
<condition operation="equal" column="folder_srl" default="0" />
<condition operation="null" column="folder_srl" pipe="or" />
</group>
</conditions>
</query>
</query>