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

Include PC layouts in mobile layout list

Browse source
This commit is contained in:
Kijin Sung 2017-07-01 21:13:33 +09:00
parent 2cd6140a89
commit 15b4782d53
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ class layoutModel extends layout
} }
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $siteSrl; $args->site_srl = $siteSrl;
$args->layout_type = $layoutType; $args->layout_type = $layoutType === 'P' ? 'P' : 'P,M';
$args->layout = $layout; $args->layout = $layout;
$output = executeQueryArray('layout.getLayoutList', $args, $columnList); $output = executeQueryArray('layout.getLayoutList', $args, $columnList);
@ -144,7 +144,7 @@ class layoutModel extends layout
{ {
foreach($output->data as $no => $iInfo) foreach($output->data as $no => $iInfo)
{ {
if($this->isExistsLayoutFile($iInfo->layout, $layoutType)) if($this->isExistsLayoutFile($iInfo->layout, $iInfo->layout_type))
{ {
$instanceList[] = $iInfo->layout; $instanceList[] = $iInfo->layout;
} }

2
modules/layout/queries/getLayoutList.xml
View file

@ -7,7 +7,7 @@
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" /> <condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
<condition operation="equal" column="layout_type" var="layout_type" default="P" pipe="and" /> <condition operation="in" column="layout_type" var="layout_type" default="P" pipe="and" />
<condition operation="equal" column="layout" var="layout" pipe="and" /> <condition operation="equal" column="layout" var="layout" pipe="and" />
</conditions> </conditions>
<navigation> <navigation>