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 #864 auto creation of duplicate layouts

Browse source
This commit is contained in:
Kijin Sung 2017-07-02 11:26:01 +09:00
parent 20177f9f41
commit 107765a19d
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/layout/layout.model.php
View file

@ -132,6 +132,10 @@ class layoutModel extends layout
$siteModuleInfo = Context::get('site_module_info'); $siteModuleInfo = Context::get('site_module_info');
$siteSrl = (int)$siteModuleInfo->site_srl; $siteSrl = (int)$siteModuleInfo->site_srl;
} }
if ($columnList && !isset($columnList['layout_type']))
{
$columnList[] = 'layout_type';
}
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $siteSrl; $args->site_srl = $siteSrl;
$args->layout_type = $layoutType === 'P' ? 'P' : 'P,M'; $args->layout_type = $layoutType === 'P' ? 'P' : 'P,M';
@ -144,7 +148,7 @@ class layoutModel extends layout
{ {
foreach($output->data as $no => $iInfo) foreach($output->data as $no => $iInfo)
{ {
if($this->isExistsLayoutFile($iInfo->layout, $iInfo->layout_type)) if($this->isExistsLayoutFile($iInfo->layout, $iInfo->layout_type) && $iInfo->layout_type === $layoutType)
{ {
$instanceList[] = $iInfo->layout; $instanceList[] = $iInfo->layout;
} }
@ -167,7 +171,7 @@ class layoutModel extends layout
$titleList[$dLayoutInfo->layout] = $dLayoutInfo->title; $titleList[$dLayoutInfo->layout] = $dLayoutInfo->title;
} }
} }
if($layout) if($layout)
{ {
if(count($instanceList) < 1 && $downloadedList[$layout]) if(count($instanceList) < 1 && $downloadedList[$layout])