From 5bf5534cdb85ef22ba1ae8c10a13fd4a6dfaf0ca Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Wed, 17 Nov 2021 18:02:25 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=B6=9C/=EC=97=B4=EB=9E=8C=20?=
 =?UTF-8?q?=EC=97=B0=EA=B2=B0=20:=20GET=EC=9C=BC=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/nlib/collection/searchItemDetail.jsp  |  4 +-
 .../WEB-INF/jsp/nlib/read/confirmRead.jsp     |  9 +++++
 .../WEB-INF/jsp/nlib/rent/confirmRent.jsp     |  9 ++++-
 src/main/webapp/js/nlib.js                    | 38 +++++++++++++------
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
index 97002f03..c2a509ee 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
@@ -229,8 +229,8 @@ function goList(){
                                 </ul>
                             </div>
                             <div class="b-btn">
-                                <button type="button" class="btn btn-color" onclick="gfn_rentItem('${result.masterId}')">대출예약</button>
-                                <button type="button" class="btn btn-green" onclick="gfn_reserveReadItem('${result.masterId}')">방문열람신청</button>
+                                <button type="button" class="btn btn-color" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출예약</button>
+                                <button type="button" class="btn btn-green" onclick="gfn_reserveReadItem('${result.mngOrgCd}', '${result.masterId}')">방문열람신청</button>
                                 <button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.useStatus}')">카트담기</button>
                             </div>
                             <c:if test="${fn:length(keywordList) > 0 }">
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
index c41777d6..fe6fe52a 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
@@ -131,8 +131,17 @@ function fn_gotoDetail(masterId) {
 }
 
 function fn_listCartItems() {
+	
+
+    <c:if test='${fromCart == "Y" }'>
     $("#frm").attr("action","${pageContext.request.contextPath}/cart/listCartItems.do");
     $("#frm").submit();     
+    </c:if>
+    
+    <c:if test='${fromCart != "Y" }'>
+    history.back();
+    </c:if>
+	
 }
 
 $(document).ready(function() {
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
index 1c3d6781..960cfbe4 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
@@ -121,8 +121,15 @@ function fn_changeInterest(masterId, onOff) {
 }
 
 function fn_listCartItems() {
+	
+	<c:if test='${fromCart == "Y" }'>
     $("#frm").attr("action","${pageContext.request.contextPath}/cart/listCartItems.do");
-    $("#frm").submit();   	
+    $("#frm").submit();     
+	</c:if>
+	
+    <c:if test='${fromCart != "Y" }'>
+    history.back();
+    </c:if>
 }
 
 function fn_gotoDetail(masterId) {
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js
index 3503a5a1..4ad7df22 100644
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@@ -601,7 +601,7 @@ function gfn_getDetail(masterId, host) {
     return;	
 }
 
-function gfn_rentItem(masterId) {
+function gfn_rentItem(mngOrgCd, masterId) {
 	
 	if(fn_isEmpty(masterId)) {
 		alert("자료ID 정보가 없습니다.");
@@ -611,13 +611,20 @@ function gfn_rentItem(masterId) {
     var form = document.createElement("form");
     form.style.display = "none";
     $(form).attr("action", "/rent/confirmRent.do");
-    $(form).attr("method", "post");
+    $(form).attr("method", "get");
+    $(form).attr("target", "_blank");
     
-    var element = document.createElement("input");
-    $(element).attr("name", "selItems");
-    $(element).attr("value", masterId);
+    var element1 = document.createElement("input");
+    $(element1).attr("name", "mngOrgCd");
+    $(element1).attr("value", mngOrgCd);
+
+    var element2 = document.createElement("input");
+    $(element2).attr("name", "selItems");
+    $(element2).attr("value", masterId);
+
+    form.appendChild(element1);
+    form.appendChild(element2);
     
-    form.appendChild(element);
     document.body.appendChild(form);
     form.submit();
     
@@ -626,7 +633,7 @@ function gfn_rentItem(masterId) {
     return;	
 }
 
-function gfn_reserveReadItem(masterId) {
+function gfn_reserveReadItem(mngOrgCd, masterId) {
 	
 	if(fn_isEmpty(masterId)) {
 		alert("자료ID 정보가 없습니다.");
@@ -636,13 +643,20 @@ function gfn_reserveReadItem(masterId) {
     var form = document.createElement("form");
     form.style.display = "none";
     $(form).attr("action", "/read/confirmRead.do");
-    $(form).attr("method", "post");
+    $(form).attr("method", "get");
+    $(form).attr("target", "_blank");
     
-    var element = document.createElement("input");
-    $(element).attr("name", "selItems");
-    $(element).attr("value", masterId);
+    var element1 = document.createElement("input");
+    $(element1).attr("name", "mngOrgCd");
+    $(element1).attr("value", mngOrgCd);
+
+    var element2 = document.createElement("input");
+    $(element2).attr("name", "selItems");
+    $(element2).attr("value", masterId);
+
+    form.appendChild(element1);
+    form.appendChild(element2);
     
-    form.appendChild(element);
     document.body.appendChild(form);
     form.submit();