Author: ashish Date: Sat Aug 27 11:44:11 2016 New Revision: 1757996 URL: http://svn.apache.org/viewvc?rev=1757996&view=rev Log: Applied patch from jira issue - OFBIZ-7851 - Clean up commented out code in Java source for Marketing. Thanks Harsh for the contribution.
Modified: ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java Modified: ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=1757996&r1=1757995&r2=1757996&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java (original) +++ ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java Sat Aug 27 11:44:11 2016 @@ -444,9 +444,6 @@ public class TrackingCodeEvents { if (cookies != null && cookies.length > 0) { for (int i = 0; i < cookies.length; i++) { String cookieName = cookies[i].getName(); - - //Debug.logInfo(" cookieName is " + cookieName, module); - //Debug.logInfo(" cookieValue is " + cookies[i].getValue(), module); // find the siteId cookie if it exists if ("Ofbiz.TKCD.SiteId".equals(cookieName)) { siteId = cookies[i].getValue(); Modified: ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java?rev=1757996&r1=1757995&r2=1757996&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java (original) +++ ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java Sat Aug 27 11:44:11 2016 @@ -192,25 +192,7 @@ public class VCard { serviceCtx.put("contactNumber", phoneAddr.substring(indexLocal)); } - /* TODO improve this part to manage party organization - Organization organization = vcard.getOrganization(); - // Useful when creating a contact with more than OOTB - if (!isGroup && organization != null && oid.getTitle() != null) { - String personalTitle = organization..getTitle().replace("\\","").replaceAll("\uFFFD", " "); - if (personalTitle.length() > 100) { - personalTitle = oid.getTitle().replace("\\", "").replaceAll("\uFFFD", " ").substring(0, 100); - } - serviceCtx.put("personalTitle", personalTitle); - } - - // Needed when creating an account (a PartyGroup) - if (isGroup) { - //serviceCtx.put("partyRole", oid.getRole()); // not used yet,maybe useful later - if (oid.hasOrganization()) { - Organization org = oid.getOrganization(); - serviceCtx.put("groupName", org.getName().replace("\\", "")); - } - }*/ + /* TODO improve this part to manage party organization */ GenericValue userLogin = (GenericValue) context.get("userLogin"); serviceCtx.put("userLogin", userLogin);