[Aplaws-commit] r1086 - in contrib/ccm-ldn-camden-consultation/trunk: . src/com/arsdigita/camden/cms/contenttypes

[<ssk...@vh...>]

Author: sskracic
Date: 2006-01-31 17:51:34 +0100 (Tue, 31 Jan 2006)
New Revision: 1086

Modified:
   contrib/ccm-ldn-camden-consultation/trunk/application.xml
   contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java
Log:
  Removing "Methodology" and "Result Feedback" fields from the email alert.


Modified: contrib/ccm-ldn-camden-consultation/trunk/application.xml
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/application.xml	2006-01-31 16:49:38 UTC (rev 1085)
+++ contrib/ccm-ldn-camden-consultation/trunk/application.xml	2006-01-31 16:51:34 UTC (rev 1086)
@@ -3,7 +3,7 @@
   name="ccm-ldn-camden-consultation"
   prettyName="Red Hat CCM Content Types"
   version="1.1.0"
-  release="5"
+  release="6"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/>

Modified: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java	2006-01-31 16:49:38 UTC (rev 1085)
+++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationAlert.java	2006-01-31 16:51:34 UTC (rev 1086)
@@ -418,10 +418,6 @@
             (String)ConsultationUtil.globalize("target_audience").localize(locale);
         String geoAreaLabel =
             (String)ConsultationUtil.globalize("geo_area").localize(locale);
-        String methodologyLabel =
-            (String)ConsultationUtil.globalize("methodology").localize(locale);
-        String feedbackLabel =
-            (String)ConsultationUtil.globalize("results_feedback").localize(locale);
 
         String siteURL =  URL.root().getURL();
         URL rootURL = URL.root();
@@ -483,9 +479,6 @@
                 globalize(statutoryFlag != null && statutoryFlag.booleanValue() ? "yes" : "no").
                 localize(locale);
 
-            String methodology = (String)items.get(Consultation.METHODOLOGY);
-            String feedback = (String)items.get(Consultation.FEEDBACK);
-
             itemList +=
                 "----------\n\n" +
                 urlLabel + ": " + itemURL + "\n\n" +
@@ -518,11 +511,6 @@
             if (geoArea != null)
                 itemList += geoAreaLabel + ": " + geoArea + "\n";
 
-            if (methodology != null && !"".equals(methodology))
-                itemList += "\n" + methodologyLabel + ":\n" + methodology.trim() + "\n";
-            if (feedback != null && !"".equals(feedback))
-                itemList += "\n" + feedbackLabel + ":\n" + feedback.trim() + "\n";
-
             itemList += "\n";
 
             itemIDs.add(id);