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

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

Author: sskracic
Date: 2005-12-21 11:58:25 +0100 (Wed, 21 Dec 2005)
New Revision: 1072

Modified:
   contrib/ccm-ldn-camden-consultation/trunk/application.xml
   contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationResources.properties
   contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/admin/BulkMobileDeletionForm.java
Log:
  Bumped release number, ready to install, fixed some minor issues.


Modified: contrib/ccm-ldn-camden-consultation/trunk/application.xml
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/application.xml	2005-12-20 19:04:35 UTC (rev 1071)
+++ contrib/ccm-ldn-camden-consultation/trunk/application.xml	2005-12-21 10:58:25 UTC (rev 1072)
@@ -3,7 +3,7 @@
   name="ccm-ldn-camden-consultation"
   prettyName="Red Hat CCM Content Types"
   version="1.1.0"
-  release="0"
+  release="1"
   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/ConsultationResources.properties
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationResources.properties	2005-12-20 19:04:35 UTC (rev 1071)
+++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ConsultationResources.properties	2005-12-21 10:58:25 UTC (rev 1072)
@@ -339,6 +339,7 @@
 
 bulk_deletion=Bulk Deletion
 email_addresses=Email Addresses
+mobile_numbers=Mobile Numbers
 
 # {0}: count of deleted Consultation alerts
 alerts_bulk_deleted=<p>{0} alert(s) have been deleted.</p>

Modified: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/admin/BulkMobileDeletionForm.java
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/admin/BulkMobileDeletionForm.java	2005-12-20 19:04:35 UTC (rev 1071)
+++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/admin/BulkMobileDeletionForm.java	2005-12-21 10:58:25 UTC (rev 1072)
@@ -51,33 +51,19 @@
     public final static String DELETION_COUNT = "deletionCount";
     public final static String DELETED_PATH = "/admin/deleted.jsp";
 
-
     private ParameterModel m_number = new StringParameter("mobile");
 
     public BulkMobileDeletionForm() {
-        this(FORM_NAME, ConsultationUtil.globalize("bulk_mobile_deletion"));
-    }
-
-    
-
-    public BulkMobileDeletionForm(String name, GlobalizedMessage heading) {
-        super(name, heading);
-
+        super(FORM_NAME, new Label());
         addWidgets();
     }
 
-    public BulkMobileDeletionForm(String name, Label heading) {
-        super(name, heading);
-
-        addWidgets();
-    }
-
     private void addWidgets() {
         Label label = new Label(ConsultationUtil.globalize("mobile_numbers"));
-        TextArea emailAddressesWidget = new TextArea(new TrimmedStringParameter(MOBILE_NUMBERS));
-        emailAddressesWidget.setCols(72);
-        emailAddressesWidget.setRows(10);
-        addField(label, emailAddressesWidget);
+        TextArea mobileNumbersWidget = new TextArea(new TrimmedStringParameter(MOBILE_NUMBERS));
+        mobileNumbersWidget.setCols(72);
+        mobileNumbersWidget.setRows(10);
+        addField(label, mobileNumbersWidget);
 
         addAction(new Submit(GlobalizationUtil.globalize("cms.ui.delete")));
         addAction(new Cancel());
@@ -106,19 +92,21 @@
             mobilesToDelete.add(mobileBuf.toString());
         }
 
-        DataCollection alerts = SessionManager.getSession()
-                                  .retrieve(ConsultationAlert.BASE_DATA_OBJECT_TYPE);
-        alerts.addEqualsFilter(ConsultationAlert.EMAIL_CONFIRMED, Boolean.TRUE);
-        alerts.addEqualsFilter(ConsultationAlert.MOBILE_CONFIRMED, Boolean.TRUE);
-        Filter f = alerts.addFilter(ConsultationAlert.MOBILE_NUMBER + " in :mobiles");
-        f.set("mobiles", mobilesToDelete);
-        while (alerts.next()) {
-            ConsultationAlert alert = new ConsultationAlert(alerts.getDataObject());
-            alert.setMobileNumber(null);
-            alert.clearMobilePin();
-            alert.setMobileConfirmed(Boolean.FALSE);
-            alert.save();
-            deletionCount++;
+        if (mobilesToDelete.size() > 0) {
+            DataCollection alerts = SessionManager.getSession()
+                                      .retrieve(ConsultationAlert.BASE_DATA_OBJECT_TYPE);
+            alerts.addEqualsFilter(ConsultationAlert.EMAIL_CONFIRMED, Boolean.TRUE);
+            alerts.addEqualsFilter(ConsultationAlert.MOBILE_CONFIRMED, Boolean.TRUE);
+            Filter f = alerts.addFilter(ConsultationAlert.MOBILE_NUMBER + " in :mobiles");
+            f.set("mobiles", mobilesToDelete);
+            while (alerts.next()) {
+                ConsultationAlert alert = new ConsultationAlert(alerts.getDataObject());
+                alert.setMobileNumber(null);
+                alert.clearMobilePin();
+                alert.setMobileConfirmed(Boolean.FALSE);
+                alert.save();
+                deletionCount++;
+            }
         }
 
         ParameterMap parameters = new ParameterMap();