Fix remove Planet sub from group.
diff --git a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java
index 082d861..26586d0 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java
@@ -228,11 +228,16 @@
PlanetManager pmgr = WebloggerFactory.getWeblogger().getPlanetManager();
- // remove subscription
Subscription sub = pmgr.getSubscription(getSubUrl());
+
+ // remove sub from group
getGroup().getSubscriptions().remove(sub);
- sub.getGroups().remove(getGroup());
pmgr.saveGroup(getGroup());
+
+ // remove group from sub
+ sub.getGroups().remove(getGroup());
+ pmgr.saveSubscription(sub);
+
WebloggerFactory.getWeblogger().flush();
// clear field after success
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp
index 3822cb7..be7ee80 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp
@@ -138,9 +138,9 @@
<%-- planet subscription delete logic --%>
<s:form action="planetGroupSubs!deleteSubscription" id="deleteForm">
- <input type="hidden" name="salt" value='<s:property value="salt" />' />
+ <s:hidden name="salt"/>
+ <s:hidden name="group.handle"/>
<input type="hidden" name="subUrl"/>
- <input type="hidden" name="groupHandle"/>
</s:form>
</s:else>
