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

issue 661, modify for cafeXE

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9742 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-10-26 01:26:50 +00:00
parent 82d5ad0cf2
commit 632b92c21a
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/layout/queries/insertLayout.xml
View file

@ -8,6 +8,7 @@
<column name="layout" var="layout" notnull="notnull" /> <column name="layout" var="layout" notnull="notnull" />
<column name="title" var="title" notnull="notnull" /> <column name="title" var="title" notnull="notnull" />
<column name="module_srl" var="module_srl" /> <column name="module_srl" var="module_srl" />
<column name="extra_vars" var="extra_vars" />
<column name="layout_path" var="layout_path" /> <column name="layout_path" var="layout_path" />
<column name="regdate" var="regdate" default="curdate()" /> <column name="regdate" var="regdate" default="curdate()" />
<column name="layout_type" var="layout_type" default="P" /> <column name="layout_type" var="layout_type" default="P" />

1
modules/layout/queries/updateLayout.xml
View file

@ -7,6 +7,7 @@
<column name="extra_vars" var="extra_vars" /> <column name="extra_vars" var="extra_vars" />
<column name="layout" var="layout" /> <column name="layout" var="layout" />
<column name="layout_path" var="layout_path" /> <column name="layout_path" var="layout_path" />
<column name="extra_vars" var="extra_vars" />
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="layout_srl" var="layout_srl" filter="number" notnull="notnull" /> <condition operation="equal" column="layout_srl" var="layout_srl" filter="number" notnull="notnull" />

17
modules/member/member.admin.controller.php
View file

@ -732,11 +732,14 @@
function insertGroup($args) { function insertGroup($args) {
if(!$args->site_srl) $args->site_srl = 0; if(!$args->site_srl) $args->site_srl = 0;
// Check the value of is_default. // Check the value of is_default.
if($args->is_default!='Y') $args->is_default = 'N'; if($args->is_default!='Y') {
$args->is_default = 'N';
} else {
$output = executeQuery('member.updateGroupDefaultClear', $args);
if(!$output->toBool()) return $output;
}
if (!$args->group_srl) $args->group_srl = getNextSequence(); if (!$args->group_srl) $args->group_srl = getNextSequence();
if (!$args->group_srl) $args->group_srl = getNextSequence();
return executeQuery('member.insertGroup', $args); return executeQuery('member.insertGroup', $args);
} }
@ -745,7 +748,13 @@
**/ **/
function updateGroup($args) { function updateGroup($args) {
// Check the value of is_default. // Check the value of is_default.
if($args->is_default!='Y') $args->is_default = 'N'; if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
if($args->is_default!='Y') {
$args->is_default = 'N';
} else {
$output = executeQuery('member.updateGroupDefaultClear', $args);
if(!$output->toBool()) return $output;
}
return executeQuery('member.updateGroup', $args); return executeQuery('member.updateGroup', $args);
} }