From 67880e01814451a6219ea806a45ae4cbdb3382a2 Mon Sep 17 00:00:00 2001
From: Minwoo Jung <minwoo.jung@navercorp.com>
Date: Fri, 10 Jul 2015 17:25:54 +0900
Subject: [PATCH 1/3] [#694]add alert message when click disabled button

---
 .../controller/BusinessTransactionController.java    |  4 ----
 .../webapp/WEB-INF/views/transactionInfoJson.jsp     | 12 +++++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
index e32bcce66..3bea619da 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
@@ -80,9 +80,6 @@ public class BusinessTransactionController {
     @Value("#{pinpointWebProps['log.page.url'] ?: ''}")
     private String logPageUrl;
     
-    @Value("#{pinpointWebProps['log.button.disable.message'] ?: ''}")
-    private String disableButtonMessage;
-    
 
     /**
      * executed URLs in applicationname query within from ~ to timeframe
@@ -197,7 +194,6 @@ public class BusinessTransactionController {
             mv.addObject("loggingTransactionInfo", recordSet.isLoggingTransactionInfo());
             mv.addObject("logButtonName", logButtonName);
             mv.addObject("logPageUrl", logPageUrl);
-            mv.addObject("disableButtonMessage", disableButtonMessage);
         }
 
         if (viewVersion == 2) {
diff --git a/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp b/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp
index d8852c258..e15188ac5 100644
--- a/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp
+++ b/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp
@@ -13,7 +13,17 @@
     "logLinkEnable" : ${logLinkEnable},
     "loggingTransactionInfo" : ${loggingTransactionInfo},
     "logButtonName": "${logButtonName}",
-    "logPageUrl" : "${logPageUrl}",
+    "logPageUrl" : 
+	    <c:choose>
+		<c:when test="${not empty logPageUrl}">
+			<c:url value="${logPageUrl}" var="comBindedlogPageUrl">
+				<c:param name="transactionId" value="${${traceId.formatString}}" />
+				<c:param name="time" value="${callstackStart}" />
+			</c:url>
+			"${comBindedlogPageUrl}"
+		</c:when>
+		<c:otherwise>""</c:otherwise>
+		</c:choose>,
     "disableButtonMessage" : "${disableButtonMessage}",
 	"callStackIndex" : {
 		"depth":0,

From 34bf1522eb29979e9f2005b2374e076baabbe1ae Mon Sep 17 00:00:00 2001
From: Minwoo Jung <minwoo.jung@navercorp.com>
Date: Fri, 10 Jul 2015 17:38:05 +0900
Subject: [PATCH 2/3] [#694]add alert message when click disabled button

---
 web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp b/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp
index e15188ac5..fcc016faa 100644
--- a/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp
+++ b/web/src/main/webapp/WEB-INF/views/transactionInfoJson.jsp
@@ -17,7 +17,7 @@
 	    <c:choose>
 		<c:when test="${not empty logPageUrl}">
 			<c:url value="${logPageUrl}" var="comBindedlogPageUrl">
-				<c:param name="transactionId" value="${${traceId.formatString}}" />
+				<c:param name="transactionId" value="${traceId.formatString}" />
 				<c:param name="time" value="${callstackStart}" />
 			</c:url>
 			"${comBindedlogPageUrl}"

From 43b4a74116bf010e1897e84006fa4e0afdec62e8 Mon Sep 17 00:00:00 2001
From: Minwoo Jung <minwoo.jung@navercorp.com>
Date: Fri, 10 Jul 2015 18:05:15 +0900
Subject: [PATCH 3/3] [#694] solve encoding problem

---
 .../web/controller/BusinessTransactionController.java        | 4 ++++
 web/src/main/resources/applicationContext-web.xml            | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
index 3bea619da..e32bcce66 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java
@@ -80,6 +80,9 @@ public class BusinessTransactionController {
     @Value("#{pinpointWebProps['log.page.url'] ?: ''}")
     private String logPageUrl;
     
+    @Value("#{pinpointWebProps['log.button.disable.message'] ?: ''}")
+    private String disableButtonMessage;
+    
 
     /**
      * executed URLs in applicationname query within from ~ to timeframe
@@ -194,6 +197,7 @@ public class BusinessTransactionController {
             mv.addObject("loggingTransactionInfo", recordSet.isLoggingTransactionInfo());
             mv.addObject("logButtonName", logButtonName);
             mv.addObject("logPageUrl", logPageUrl);
+            mv.addObject("disableButtonMessage", disableButtonMessage);
         }
 
         if (viewVersion == 2) {
diff --git a/web/src/main/resources/applicationContext-web.xml b/web/src/main/resources/applicationContext-web.xml
index f7343db96..c101f74da 100644
--- a/web/src/main/resources/applicationContext-web.xml
+++ b/web/src/main/resources/applicationContext-web.xml
@@ -40,7 +40,10 @@
         </property>
     </bean>
     
-    <util:properties id="pinpointWebProps" location="classpath:pinpoint-web.properties"/>
+    <bean id="pinpointWebProps" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+        <property name="location" value="classpath:pinpoint-web.properties"/>
+        <property name="fileEncoding" value="UTF-8"/>
+    </bean>
     
     <!-- 
     <util:properties id="dataProps" location="classpath:data.properties"/>