Author: agilliland
Date: Fri Apr 14 13:21:47 2006
New Revision: 394188
URL: http://svn.apache.org/viewcvs?rev=394188&view=rev
Log:
tidying up category business calls in presentation layer.
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java?rev=394188&r1=394187&r2=394188&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java
Fri Apr 14 13:21:47 2006
@@ -128,7 +128,7 @@
&& !parent.descendentOf(cd))
{
cd.setParent(parent);
- cd.save();
+ wmgr.storeWeblogCategory(cd);
}
else
{
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java?rev=394188&r1=394187&r2=394188&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
Fri Apr 14 13:21:47 2006
@@ -14,6 +14,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.roller.RollerException;
import org.roller.model.RollerFactory;
import org.roller.model.WeblogManager;
import org.roller.pojos.WeblogCategoryData;
@@ -67,7 +68,8 @@
// root and the sub-cats of the category being deleted.
if (!cat.getId().equals(catid)
&& cat.getParent()!=null
- && !cat.descendentOf(catToDelete))
+ && !cat.descendentOf(catToDelete)
+ && cat.retrieveWeblogEntries(true).size() < 1)
{
destCats.add(cat);
}
@@ -90,27 +92,17 @@
}
}
}
- else if (form.isDelete().booleanValue())
- {
- // User clicked YES to delete
- WeblogCategoryData destCat = null;
- if (form.getMoveToWeblogCategoryId() != null)
- {
- destCat =
wmgr.retrieveWeblogCategory(form.getMoveToWeblogCategoryId());
- }
-
- // move entries to destCat and remove catToDelete
- catToDelete.remove(destCat);
+ else if (form.isDelete().booleanValue()) {
- RollerFactory.getRoller().commit();
+ // User clicked YES to delete
+ // remove cat to delete
+ wmgr.removeWeblogCategory(catToDelete);
// notify caches of invalidated object
CacheManager.invalidate(catToDelete);
- if (null != returnId)
- {
- request.setAttribute(
- RollerRequest.WEBLOGCATEGORYID_KEY, returnId);
+ if (null != returnId) {
+ request.setAttribute(RollerRequest.WEBLOGCATEGORYID_KEY,
returnId);
}
}
else
