diff --git a/modules/homepage/homepage.admin.controller.php b/modules/homepage/homepage.admin.controller.php
index 1d34f5108..9d504da98 100644
--- a/modules/homepage/homepage.admin.controller.php
+++ b/modules/homepage/homepage.admin.controller.php
@@ -255,6 +255,9 @@
// 회원 그룹 매핑 데이터 삭제
executeQuery('member.deleteMemberGroup', $args);
+ // 회원 그룹 삭제
+ executeQuery('member.deleteSiteGroup', $args);
+
// 메뉴 삭제
$oMenuAdminController = &getAdminController('menu');
Context::set('menu_srl', $homepage_info->first_menu_srl);
diff --git a/modules/homepage/tpl/delete.html b/modules/homepage/tpl/delete.html
index df3891cfe..57b95bdb2 100644
--- a/modules/homepage/tpl/delete.html
+++ b/modules/homepage/tpl/delete.html
@@ -10,7 +10,7 @@
- | {$lang->cmd_homepage_delete} |
+ {$lang->cmd_homepage_delete} |
@@ -28,6 +28,7 @@
{$val->nick_name} ({$val->user_id})
+
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 2cc3fe2df..75e5a63c5 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -122,19 +122,14 @@
// site_module_info에 따라서 관리자/ 그룹 목록을 매번 재지정
$site_module_info = Context::get('site_module_info');
if($site_module_info) {
- unset($logged_info->group_list);
- $site_srl = $site_module_info->site_srl;
- $groups = $this->getMemberGroups($logged_info->member_srl, $site_srl);
-
- // 만약 현재 접속된 사이트의 그룹이 없으면 기본 그룹을 지정
- if(!count($groups)) {
+ $logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
+ if(!count($logged_info->group_list)) {
$default_group = $this->getDefaultGroup($site_module_info->site_srl);
$oMemberController = &getController('member');
- $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_srl);
+ $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
$groups[$default_group->group_srl] = $default_group->title;
+ $logged_info->group_list = $groups;
}
-
- $logged_info->group_list = $groups;
$oModuleModel = &getModel('module');
if($oModuleModel->isSiteAdmin()) $logged_info->is_site_admin = true;
@@ -168,14 +163,14 @@
/**
* @brief member_srl로 사용자 정보 return
**/
- function getMemberInfoByMemberSrl($member_srl) {
+ function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) {
if(!$member_srl) return;
$args->member_srl = $member_srl;
$output = executeQuery('member.getMemberInfoByMemberSrl', $args);
if(!$output) return $output;
$member_info = $this->arrangeMemberInfo($output->data);
- $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+ $member_info->group_list = $this->getMemberGroups($member_info->member_srl, $site_srl);
return $member_info;
}
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index acb890d87..838f9bd4b 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -47,7 +47,8 @@
return $this->dispMemberSignUpForm();
}
- $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+ $site_module_info = Context::get('site_module_info');
+ $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl);
unset($member_info->password);
unset($member_info->email_id);
unset($member_info->email_host);
diff --git a/modules/member/queries/deleteSiteGroup.xml b/modules/member/queries/deleteSiteGroup.xml
new file mode 100644
index 000000000..816900a19
--- /dev/null
+++ b/modules/member/queries/deleteSiteGroup.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+