Author: billyxie
Date: 2009-09-28 11:46:44 +0200 (Mon, 28 Sep 2009)
New Revision: 38881
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1541 - Number newsletter subscriptions in overview is not matching number
of subscriptions
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:46:21 UTC (rev 38880)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:46:44 UTC (rev 38881)
@@ -101,14 +101,16 @@
String stauts = subscription.getStatus().toString();
Node record = cloud.getNode(subscription.getId());
- record.setStringValue("status", stauts);
- record.commit();
-
if ("INACTIVE".equals(stauts)) {
- record.deleteRelations("termed");
- record.commit();
+ if (Publish.isPublished(record)) {
+ Publish.unpublish(record);
+ }
+ record.deleteRelations();
+ record.delete();
+ } else {
+ record.setStringValue("status", stauts);
+ record.commit();
}
-
}
public void pause(int subscriptionId) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
