From: Sudarshan Kumar <sudarshan.kumar@att.com>
Date: Fri, 18 Sep 2020 09:30:03 +0000 (+0530)
Subject: Fixed Single Quote issue with Form Fields
X-Git-Tag: 3.4.0~18^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a7e43fd0e0a9a80f9dd3a5bdb0bcbd7deb286121;p=portal%2Fsdk.git

Fixed Single Quote issue with Form Fields

Fixed Single Quote issue with Form Fields

Issue-ID: PORTAL-1014
Change-Id: Ibc75f2e11628f661719f058751c7e49bafb34ee6
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>
---

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java
index 27ad62f9..4037bd0e 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java
@@ -2651,6 +2651,11 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp
                 generatedChartSQL = replaceNewLine(generatedChartSQL, "" + '\n', " " + '\n' + " ");
 		} 
 
+        //Added Below code to by pass single quotes issue with form fields
+        if(generatedSQL != null && !generatedSQL.isEmpty()) {
+        	generatedSQL = generatedSQL.replace("'(", "(");
+        	generatedSQL = generatedSQL.replace(")'", ")");
+        }
         return generatedSQL;
 	}