fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 06:39:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

r17463267 홈페이지의 그룹 관련 오류 수정

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4900 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2008-11-19 07:49:53 +00:00
parent e4198480de
commit 081ef155ff
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/homepage/homepage.admin.controller.php
View file

@ -255,6 +255,9 @@
// 회원 그룹 매핑 데이터 삭제 // 회원 그룹 매핑 데이터 삭제
executeQuery('member.deleteMemberGroup', $args); executeQuery('member.deleteMemberGroup', $args);
// 회원 그룹 삭제
executeQuery('member.deleteSiteGroup', $args);
// 메뉴 삭제 // 메뉴 삭제
$oMenuAdminController = &getAdminController('menu'); $oMenuAdminController = &getAdminController('menu');
Context::set('menu_srl', $homepage_info->first_menu_srl); Context::set('menu_srl', $homepage_info->first_menu_srl);

3
modules/homepage/tpl/delete.html
View file

@ -10,7 +10,7 @@
<table cellspacing="0" class="adminTable"> <table cellspacing="0" class="adminTable">
<thead> <thead>
<tr> <tr>
<th colspan="2">{$lang->cmd_homepage_delete}</th> <th colspan="2"><div>{$lang->cmd_homepage_delete}</div></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -28,6 +28,7 @@
<!--@foreach($admin_list as $key => $val)--> <!--@foreach($admin_list as $key => $val)-->
{$val->nick_name} ({$val->user_id})<br /> {$val->nick_name} ({$val->user_id})<br />
<!--@end--> <!--@end-->
&nbsp;
</td> </td>
</tr> </tr>
<tr> <tr>

17
modules/member/member.model.php
View file

@ -122,20 +122,15 @@
// site_module_info에 따라서 관리자/ 그룹 목록을 매번 재지정 // site_module_info에 따라서 관리자/ 그룹 목록을 매번 재지정
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
if($site_module_info) { if($site_module_info) {
unset($logged_info->group_list); $logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
$site_srl = $site_module_info->site_srl; if(!count($logged_info->group_list)) {
$groups = $this->getMemberGroups($logged_info->member_srl, $site_srl);
// 만약 현재 접속된 사이트의 그룹이 없으면 기본 그룹을 지정
if(!count($groups)) {
$default_group = $this->getDefaultGroup($site_module_info->site_srl); $default_group = $this->getDefaultGroup($site_module_info->site_srl);
$oMemberController = &getController('member'); $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; $groups[$default_group->group_srl] = $default_group->title;
$logged_info->group_list = $groups;
} }
$logged_info->group_list = $groups;
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
if($oModuleModel->isSiteAdmin()) $logged_info->is_site_admin = true; if($oModuleModel->isSiteAdmin()) $logged_info->is_site_admin = true;
else $logged_info->is_site_admin = false; else $logged_info->is_site_admin = false;
@ -168,14 +163,14 @@
/** /**
* @brief member_srl로 사용자 정보 return * @brief member_srl로 사용자 정보 return
**/ **/
function getMemberInfoByMemberSrl($member_srl) { function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) {
if(!$member_srl) return; if(!$member_srl) return;
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
$output = executeQuery('member.getMemberInfoByMemberSrl', $args); $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
if(!$output) return $output; if(!$output) return $output;
$member_info = $this->arrangeMemberInfo($output->data); $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; return $member_info;
} }

3
modules/member/member.view.php
View file

@ -47,7 +47,8 @@
return $this->dispMemberSignUpForm(); 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->password);
unset($member_info->email_id); unset($member_info->email_id);
unset($member_info->email_host); unset($member_info->email_host);

8
modules/member/queries/deleteSiteGroup.xml Normal file
View file

@ -0,0 +1,8 @@
<query id="deleteSiteGroup" action="delete">
<tables>
<table name="member_group" />
</tables>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
</conditions>
</query>