You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/03/27 22:00:05 UTC
svn commit: r389244 - in /incubator/roller/trunk:
src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
web/WEB-INF/classes/ApplicationResources.properties
Author: snoopdave
Date: Mon Mar 27 12:00:03 2006
New Revision: 389244
URL: http://svn.apache.org/viewcvs?rev=389244&view=rev
Log:
Fix for ROL-1094 which was preventing addition of new planet subscriptions
Modified:
incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
Modified: incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java?rev=389244&r1=389243&r2=389244&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java Mon Mar 27 12:00:03 2006
@@ -200,20 +200,25 @@
if (RollerSession.getRollerSession(request).isGlobalAdminUser()) {
+ ActionMessages messages = new ActionMessages();
PlanetSubscriptionData sub = null;
ActionErrors errors = validate(planet, form);
if (errors.isEmpty()) {
if (form.getId() == null || form.getId().trim().length() == 0) {
- // User adding new subscription to group.
- // Does form specify a subscription that already exists?
+ // Adding new subscription to group
+ // But, does subscription to that feed already exist?
if (form.getFeedUrl() != null) {
- sub = planet.getSubscription(form.getFeedUrl());
+ sub = planet.getSubscription(form.getFeedUrl());
}
- // If not, then create a new one
- if (sub == null) {
- sub = new PlanetSubscriptionData();
- }
- // And add it to the group
+ if (sub != null) {
+ // Yes, we'll use it instead
+ messages.add(null, new ActionMessage(
+ "planetSubscription.foundExisting", sub.getTitle()));
+ } else {
+ // No, add new subscription
+ sub = new PlanetSubscriptionData();
+ form.copyTo(sub, request.getLocale());
+ }
targetGroup.addSubscription(sub);
} else {
@@ -226,7 +231,6 @@
planet.saveGroup(targetGroup);
roller.commit();
- ActionMessages messages = new ActionMessages();
messages.add(null,
new ActionMessage("planetSubscription.success.saved"));
saveMessages(request, messages);
Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?rev=389244&r1=389243&r2=389244&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties Mon Mar 27 12:00:03 2006
@@ -961,6 +961,7 @@
planetSubscription.edit.tip=Edit this subscription
planetSubscription.success.deleted=Subscription successfully deleted
+planetSubscription.foundExisting=Found existing subscription [{0}], adding it instead
planetSubscription.success.saved=Saved subscription
planetSubscription.error=Must specify newfeed URL