From 4fac931f2817ffaf54531e50d106024ea8f619df Mon Sep 17 00:00:00 2001
From: Chanyoung Oh <ndcd607@gmail.com>
Date: Sat, 13 Feb 2021 13:40:22 +0000
Subject: [PATCH 1/6] Initialize category list if module_srl is provied - Issue
 #1595

---
 modules/document/tpl/checked_list.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index 8fad65593..b6fc7ac6f 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -71,5 +71,8 @@ jQuery(function($){
 			message_content_area.prop("disabled", false);
 		}
 	});
+	<!--@if($module_srl > 0)-->
+	doGetCategoryFromModule({$module_srl});
+	<!--@end-->
 });
 </script>
\ No newline at end of file

From a75f0b1c3b704b561595e60edfc8db24c97196eb Mon Sep 17 00:00:00 2001
From: Chanyoung Oh <ndcd607@gmail.com>
Date: Sat, 13 Feb 2021 13:49:07 +0000
Subject: [PATCH 2/6] Update skins to provide `module_srl` - Issue #1595

* Update default skins (XEDITION, default) to provide `module_srl` to
document management popup
---
 modules/board/skins/default/list.html  | 2 +-
 modules/board/skins/xedition/list.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/board/skins/default/list.html b/modules/board/skins/default/list.html
index 2e97feef4..1100c3bfa 100644
--- a/modules/board/skins/default/list.html
+++ b/modules/board/skins/default/list.html
@@ -132,7 +132,7 @@
 	</div>
 	<div class="btnArea">
 		<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn">{$lang->cmd_write}</a>
-		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument')}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
+		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','module_srl',$mi->module_srl)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
 	</div>
 	<button type="button" class="bsToggle" title="{$lang->cmd_search}">{$lang->cmd_search}</button>
 	<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">
diff --git a/modules/board/skins/xedition/list.html b/modules/board/skins/xedition/list.html
index 08b9b2383..4dc6f2568 100644
--- a/modules/board/skins/xedition/list.html
+++ b/modules/board/skins/xedition/list.html
@@ -136,7 +136,7 @@
 		<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn"><i class="xi-pen"></i> {$lang->cmd_write}</a>
 		<a href="{getUrl('act','dispBoardTagList')}" class="btn" title="{$lang->tag}"><i class="xi-tag"></i> {$lang->tag}</a>
 		<a cond="$grant->manager" class="btn" href="{getUrl('act','dispBoardAdminBoardInfo')}" title="{$lang->cmd_setup}"><i class="xi-cog"></i> {$lang->cmd_setup}</a>			
-		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument')}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
+		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','module_srl',$mi->module_srl)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
 	</div>
 
 	<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">

From 6c51f3234e5a67a5501693dc5228a8cb9ed7c578 Mon Sep 17 00:00:00 2001
From: Chanyoung Oh <ndcd607@gmail.com>
Date: Mon, 15 Feb 2021 14:59:41 +0000
Subject: [PATCH 3/6] Set target module based on article list when managing
 documents

---
 modules/document/document.view.php | 33 +++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/document/document.view.php b/modules/document/document.view.php
index ef831478b..3b5fa052f 100644
--- a/modules/document/document.view.php
+++ b/modules/document/document.view.php
@@ -104,9 +104,40 @@ class documentView extends document
 			Context::set('document_list', array());
 		}
 
+		// Set target module info
+		$target_mid = Context::get('target_mid');
 		$module_srl = intval(Context::get('module_srl'));
+
+		if(!is_null($target_mid)) {
+			// if target_mid is provided
+			$module_info = ModuleModel::getModuleInfoByMid($target_mid);
+			if(!is_bool($module_info)) {
+				$module_srl = $module_info->module_srl;
+			}
+		}
+		else if($module_srl > 0) {
+			// if module_srl is provided instead of target_mid (legacy)
+			$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
+		}
+		else
+		{
+			// if no module info is provided
+			$document_module_srl_list = array();
+			foreach($document_list as $key => $val) {
+				$document_module_srl = $val->variables['module_srl'];
+				if(!in_array($document_module_srl, $document_module_srl_list))
+				{
+					array_push($document_module_srl_list, $document_module_srl);
+				}
+			}
+			if(count($document_module_srl_list) == 1)
+			{
+				// set module_srl if all documents has one common module_srl
+				$module_srl = $document_module_srl;
+			}
+			$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
+		}
 		Context::set('module_srl',$module_srl);
-		$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
 		Context::set('mid',$module_info->mid);
 		Context::set('browser_title',$module_info->browser_title);
 

From 400bbeeb6af324c5702e9762eccf263074bf133d Mon Sep 17 00:00:00 2001
From: Chanyoung Oh <ndcd607@gmail.com>
Date: Tue, 16 Feb 2021 14:11:25 +0000
Subject: [PATCH 4/6] Update skins to use mid instead of module_srl

* Update XEDITION, XE Default skin to use mid instead of module_srl
when opening document management popup
---
 modules/board/skins/default/list.html  | 2 +-
 modules/board/skins/xedition/list.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/board/skins/default/list.html b/modules/board/skins/default/list.html
index 1100c3bfa..db617bf65 100644
--- a/modules/board/skins/default/list.html
+++ b/modules/board/skins/default/list.html
@@ -132,7 +132,7 @@
 	</div>
 	<div class="btnArea">
 		<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn">{$lang->cmd_write}</a>
-		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','module_srl',$mi->module_srl)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
+		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','target_mid',$mid)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
 	</div>
 	<button type="button" class="bsToggle" title="{$lang->cmd_search}">{$lang->cmd_search}</button>
 	<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">
diff --git a/modules/board/skins/xedition/list.html b/modules/board/skins/xedition/list.html
index 4dc6f2568..98a300dfb 100644
--- a/modules/board/skins/xedition/list.html
+++ b/modules/board/skins/xedition/list.html
@@ -136,7 +136,7 @@
 		<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn"><i class="xi-pen"></i> {$lang->cmd_write}</a>
 		<a href="{getUrl('act','dispBoardTagList')}" class="btn" title="{$lang->tag}"><i class="xi-tag"></i> {$lang->tag}</a>
 		<a cond="$grant->manager" class="btn" href="{getUrl('act','dispBoardAdminBoardInfo')}" title="{$lang->cmd_setup}"><i class="xi-cog"></i> {$lang->cmd_setup}</a>			
-		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','module_srl',$mi->module_srl)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
+		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','target_mid',$mid)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
 	</div>
 
 	<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">

From b483992c83ee1cf03fb7b4401e0b4ab422b0d407 Mon Sep 17 00:00:00 2001
From: Chanyoung Oh <ndcd607@gmail.com>
Date: Tue, 16 Feb 2021 14:33:10 +0000
Subject: [PATCH 5/6] Fix bug with non-existent mid

* Use is_null instead of is_bool to check module
---
 modules/document/document.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/document/document.view.php b/modules/document/document.view.php
index 3b5fa052f..6bb4d1bc2 100644
--- a/modules/document/document.view.php
+++ b/modules/document/document.view.php
@@ -111,7 +111,7 @@ class documentView extends document
 		if(!is_null($target_mid)) {
 			// if target_mid is provided
 			$module_info = ModuleModel::getModuleInfoByMid($target_mid);
-			if(!is_bool($module_info)) {
+			if(!is_null($module_info)) {
 				$module_srl = $module_info->module_srl;
 			}
 		}

From b2af6eeed7f346aab9942cda9066f8416355168b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 22 Feb 2021 22:25:19 +0900
Subject: [PATCH 6/6] =?UTF-8?q?#1624=20=EB=B3=B4=EC=99=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/board/skins/default/list.html  |  2 +-
 modules/board/skins/xedition/list.html |  2 +-
 modules/document/document.view.php     | 44 ++++++++++++--------------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/modules/board/skins/default/list.html b/modules/board/skins/default/list.html
index db617bf65..979c48c84 100644
--- a/modules/board/skins/default/list.html
+++ b/modules/board/skins/default/list.html
@@ -132,7 +132,7 @@
 	</div>
 	<div class="btnArea">
 		<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn">{$lang->cmd_write}</a>
-		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','target_mid',$mid)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
+		<a cond="$grant->manager" href="{getUrl('','mid',$mid,'act','dispDocumentManageDocument')}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
 	</div>
 	<button type="button" class="bsToggle" title="{$lang->cmd_search}">{$lang->cmd_search}</button>
 	<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">
diff --git a/modules/board/skins/xedition/list.html b/modules/board/skins/xedition/list.html
index 98a300dfb..1d72e05de 100644
--- a/modules/board/skins/xedition/list.html
+++ b/modules/board/skins/xedition/list.html
@@ -136,7 +136,7 @@
 		<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn"><i class="xi-pen"></i> {$lang->cmd_write}</a>
 		<a href="{getUrl('act','dispBoardTagList')}" class="btn" title="{$lang->tag}"><i class="xi-tag"></i> {$lang->tag}</a>
 		<a cond="$grant->manager" class="btn" href="{getUrl('act','dispBoardAdminBoardInfo')}" title="{$lang->cmd_setup}"><i class="xi-cog"></i> {$lang->cmd_setup}</a>			
-		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument','target_mid',$mid)}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
+		<a cond="$grant->manager" href="{getUrl('','mid',$mid,'act','dispDocumentManageDocument')}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
 	</div>
 
 	<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">
diff --git a/modules/document/document.view.php b/modules/document/document.view.php
index 6bb4d1bc2..63023e5a3 100644
--- a/modules/document/document.view.php
+++ b/modules/document/document.view.php
@@ -105,41 +105,39 @@ class documentView extends document
 		}
 
 		// Set target module info
-		$target_mid = Context::get('target_mid');
+		$target_mid = Context::getRequestVars()->mid ?? '';
 		$module_srl = intval(Context::get('module_srl'));
-
-		if(!is_null($target_mid)) {
-			// if target_mid is provided
+		
+		// if target mid is provided
+		if($target_mid && $target_mid === Context::get('mid'))
+		{
 			$module_info = ModuleModel::getModuleInfoByMid($target_mid);
-			if(!is_null($module_info)) {
-				$module_srl = $module_info->module_srl;
-			}
+			$module_srl = $module_info ? $module_info->module_srl : 0;
 		}
-		else if($module_srl > 0) {
-			// if module_srl is provided instead of target_mid (legacy)
+		// if module_srl is provided instead of target_mid (legacy)
+		elseif($module_srl > 0)
+		{
 			$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
+			$module_srl = $module_info ? $module_info->module_srl : 0;
 		}
+		// if no module info is provided
 		else
 		{
-			// if no module info is provided
-			$document_module_srl_list = array();
-			foreach($document_list as $key => $val) {
-				$document_module_srl = $val->variables['module_srl'];
-				if(!in_array($document_module_srl, $document_module_srl_list))
-				{
-					array_push($document_module_srl_list, $document_module_srl);
-				}
-			}
+			// set module_srl if all documents has one common module_srl
+			$document_module_srl_list = array_unique(array_map(function($document) {
+				return $document->get('module_srl');
+			}, $document_list));
 			if(count($document_module_srl_list) == 1)
 			{
-				// set module_srl if all documents has one common module_srl
-				$module_srl = $document_module_srl;
+				$module_srl = array_first($document_module_srl_list);
 			}
 			$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
+			$module_srl = $module_info ? $module_info->module_srl : 0;
 		}
-		Context::set('module_srl',$module_srl);
-		Context::set('mid',$module_info->mid);
-		Context::set('browser_title',$module_info->browser_title);
+		
+		Context::set('module_srl', $module_srl);
+		Context::set('mid', $module_info ? $module_info->mid : '');
+		Context::set('browser_title', $module_info ? $module_info->browser_title : '');
 
 		// Select Pop-up layout
 		$this->setLayoutPath('./common/tpl');