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

Prepare for downgrade from future version where domain_srl may be duplicate

Browse source
This commit is contained in:
Kijin Sung 2021-02-23 17:00:21 +09:00
parent e423cba24d
commit d3e390e3fe
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/admin.admin.view.php
View file

@ -695,7 +695,7 @@ class adminAdminView extends admin
$domain_info = null; $domain_info = null;
if ($domain_srl !== '') if ($domain_srl !== '')
{ {
$domain_info = getModel('module')->getSiteInfo($domain_srl); $domain_info = ModuleModel::getSiteInfo($domain_srl);
if ($domain_info->domain_srl != $domain_srl) if ($domain_info->domain_srl != $domain_srl)
{ {
throw new Rhymix\Framework\Exception('msg_domain_not_found'); throw new Rhymix\Framework\Exception('msg_domain_not_found');

7
modules/module/queries/getDomainInfo.xml
View file

@ -6,11 +6,12 @@
<columns> <columns>
<column name="domains.*" /> <column name="domains.*" />
<column name="modules.*" /> <column name="modules.*" />
<column name="domains.domain_srl" alias="domain_srl" />
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="modules.module_srl" default="domains.index_module_srl" notnull="notnull" /> <condition operation="equal" column="modules.module_srl" default="domains.index_module_srl" notnull="notnull" />
<condition operation="equal" column="domain_srl" var="domain_srl" pipe="and" /> <condition operation="equal" column="domains.domain_srl" var="domain_srl" pipe="and" />
<condition operation="equal" column="domain" var="domain" pipe="and" /> <condition operation="equal" column="domains.domain" var="domain" pipe="and" />
<condition operation="equal" column="is_default_domain" var="is_default_domain" pipe="and" /> <condition operation="equal" column="domains.is_default_domain" var="is_default_domain" pipe="and" />
</conditions> </conditions>
</query> </query>