Author: snoopdave
Date: Thu May 24 15:18:58 2007
New Revision: 541454
URL: http://svn.apache.org/viewvc?view=rev&rev=541454
Log:
New JPA backend merge: changes to ensure that relationships are maintained on
both sides.
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java?view=diff&rev=541454&r1=541453&r2=541454
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
Thu May 24 15:18:58 2007
@@ -115,6 +115,7 @@
} else {
PlanetGroupData group = getGroup();
group.getSubscriptions().remove(sub);
+ sub.getGroups().remove(group);
pmgr.saveGroup(group);
PlanetFactory.getPlanet().flush();
}
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java?view=diff&rev=541454&r1=541453&r2=541454
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
Thu May 24 15:18:58 2007
@@ -96,6 +96,7 @@
// add the sub to the group
group.getSubscriptions().add(this.subscription);
+ this.subscription.getGroups().add(group);
pMgr.saveGroup(group);
} else {
