[MMBASE SCM] r38867 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl

2009-09-26 Thread raintang 
Author: raintang
Date: 2009-09-27 03:51:29 +0200 (Sun, 27 Sep 2009)
New Revision: 38867

Modified:
   
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1543 When a community user is deleted, subscriptionrecords are not removed 
from live

Modified: 
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
--- 
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
   2009-09-26 01:02:04 UTC (rev 38866)
+++ 
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
   2009-09-27 01:51:29 UTC (rev 38867)
@@ -462,11 +462,15 @@
   Query query = recordManager.createQuery();
   SearchUtil.addEqualConstraint(query, 
recordManager.getField(subscriber), String.valueOf(anthId));
   ListNode subscriptions = query.getList();
-  for (Node subscription : subscriptions) { 
- if (Publish.isPublished(subscription)) {
- Publish.unpublish(subscription);
+  for (Node subscription : subscriptions) {
+ if (ServerUtil.isStaging()) {
+if (Publish.isPublished(subscription)) {
+   Publish.unpublish(subscription);
+}
+ } else if (ServerUtil.isLive()) {
+Publish.unpublish(subscription);
  }
- subscription.delete(true);   
+ subscription.delete(true);
   }
}
 }

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE SCM] r38868 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl

2009-09-26 Thread raintang 
Author: raintang
Date: 2009-09-27 03:51:46 +0200 (Sun, 27 Sep 2009)
New Revision: 38868

Modified:
   
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1543 When a community user is deleted, subscriptionrecords are not removed 
from live

Modified: 
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
--- 
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
   2009-09-27 01:51:29 UTC (rev 38867)
+++ 
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
   2009-09-27 01:51:46 UTC (rev 38868)
@@ -463,8 +463,12 @@
   SearchUtil.addEqualConstraint(query, 
recordManager.getField(subscriber), String.valueOf(anthId));
   ListNode subscriptions = query.getList();
   for (Node subscription : subscriptions) { 
- if (Publish.isPublished(subscription)) {
- Publish.unpublish(subscription);
+ if (ServerUtil.isStaging()) {
+if (Publish.isPublished(subscription)) {
+   Publish.unpublish(subscription);
+}
+ } else if (ServerUtil.isLive()) {
+Publish.unpublish(subscription);
  }
  subscription.delete(true);   
   }

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE SCM] r38869 - CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl

2009-09-26 Thread raintang 
Author: raintang
Date: 2009-09-27 03:52:05 +0200 (Sun, 27 Sep 2009)
New Revision: 38869

Modified:
   
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1543 When a community user is deleted, subscriptionrecords are not removed 
from live

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-27 01:51:46 UTC (rev 38868)
+++ 
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
   2009-09-27 01:52:05 UTC (rev 38869)
@@ -463,8 +463,12 @@
   SearchUtil.addEqualConstraint(query, 
recordManager.getField(subscriber), String.valueOf(anthId));
   ListNode subscriptions = query.getList();
   for (Node subscription : subscriptions) { 
- if (Publish.isPublished(subscription)) {
- Publish.unpublish(subscription);
+ if (ServerUtil.isStaging()) {
+if (Publish.isPublished(subscription)) {
+   Publish.unpublish(subscription);
+}
+ } else if (ServerUtil.isLive()) {
+Publish.unpublish(subscription);
  }
  subscription.delete(true);   
   }

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs