diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php index 23d081aa0..14e21c3f9 100644 --- a/modules/member/lang/ko.lang.php +++ b/modules/member/lang/ko.lang.php @@ -78,7 +78,7 @@ $lang->cmd_store = "보관"; $lang->cmd_add_friend_group = '친구 그룹 추가'; - $lang->msg_cart_is_null = '삭제할 대상을 선택해주세요'; + $lang->msg_cart_is_null = '대상을 선택해주세요'; $lang->msg_checked_file_is_deleted = '%d개의 첨부파일이 삭제되었습니다'; $lang->msg_no_message = '쪽지가 없습니다'; diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index cc34c3654..9523de390 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -233,10 +233,26 @@ if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); $logged_info = Context::get('logged_info'); + // 변수 체크 + $friend_srl_list = trim(Context::get('friend_srl_list')); + if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null'); + + $friend_srl_list = explode('|@|', $friend_srl_list); + if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null'); + + $friend_count = count($friend_srl_list); + $target = array(); + for($i=0;$i<$friend_count;$i++) { + $friend_srl = (int)trim($friend_srl_list[$i]); + if(!$friend_srl) continue; + $target[] = $friend_srl; + } + if(!count($target)) return new Object(-1,'msg_cart_is_null'); + // 변수 정리 - $args->friend_srl = Context::get('friend_srl'); + $args->friend_srls = implode(',',$target); $args->member_srl = $logged_info->member_srl; - $args->friend_group_srl = Context::get('friend_group_srl'); + $args->friend_group_srl = Context::get('target_friend_group_srl'); $output = executeQuery('member.moveFriend', $args); if(!$output->toBool()) return $output; diff --git a/modules/member/member.view.php b/modules/member/member.view.php index ffae535ba..09e783af5 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -286,12 +286,23 @@ $oMemberModel = &getModel('member'); // 그룹 목록을 가져옴 - $friend_group_list = $oMemberModel->getFriendGroups(); + $tmp_group_list = $oMemberModel->getFriendGroups(); + $group_count = count($tmp_group_list); + for($i=0;$i<$group_count;$i++) $friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i]; Context::set('friend_group_list', $friend_group_list); // 친구 목록을 가져옴 $friend_group_srl = Context::get('friend_group_srl'); $output = $oMemberModel->getFriends($friend_group_srl); + $friend_count = count($output->data); + if($friend_count) { + foreach($output->data as $key => $val) { + $group_srl = $val->friend_group_srl; + $group_title = $friend_group_list[$group_srl]->title; + if(!$group_title) $group_title = Context::get('default_friend_group'); + $output->data[$key]->group_title = $group_title; + } + } // 템플릿에 쓰기 위해서 context::set Context::set('total_count', $output->total_count); diff --git a/modules/member/queries/moveFriend.xml b/modules/member/queries/moveFriend.xml index 05e27a810..2ae898eb6 100644 --- a/modules/member/queries/moveFriend.xml +++ b/modules/member/queries/moveFriend.xml @@ -3,8 +3,10 @@