From e22ae8259a4a5d3a7b11d77274fa555cf1d04d18 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 17 Jul 2023 21:58:25 +0900 Subject: [PATCH] Open most member popup menus in the same window #2154 --- common/js/common.js | 5 +++++ modules/member/member.model.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/js/common.js b/common/js/common.js index ff50bf93f..9e99be26a 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -221,6 +221,11 @@ var icon = item[i].icon; var target = item[i].target; + // Convert self to _self #2154 + if (target === 'self') { + target = '_self'; + } + var actmatch = url.match(/\bact=(\w+)/) || url.match(/\b((?:disp|proc)\w+)/); var act = actmatch ? actmatch[1] : null; var classText = 'class="' + (classname ? classname : (act ? (act + ' ') : '')); diff --git a/modules/member/member.model.php b/modules/member/member.model.php index c5c3d3c3f..fb7ff77c2 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -249,7 +249,7 @@ class MemberModel extends Member if($logged_info->member_srl) { $url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl); - $oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path); + $oMemberController->addMemberPopupMenu($url, 'cmd_view_member_info', $icon_path, 'self'); } // When click other's nickname @@ -321,7 +321,7 @@ class MemberModel extends Member $oMemberController->addMemberPopupMenu($url,'cmd_manage_member_info',$icon_path,'MemberModifyInfo'); $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',0); - $oMemberController->addMemberPopupMenu($url,'cmd_spammer',$icon_path,'popup'); + $oMemberController->addMemberPopupMenu($url,'cmd_spammer',$icon_path,'MemberSpammer'); $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl); $oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');