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 2005/08/30 04:26:15 UTC
svn commit: r264673 - in /incubator/roller/branches/roller_2.0:
src/org/roller/pojos/ src/org/roller/presentation/
src/org/roller/presentation/bookmarks/actions/
src/org/roller/presentation/weblog/actions/
src/org/roller/presentation/weblog/formbeans/ ...
Author: snoopdave
Date: Mon Aug 29 19:25:49 2005
New Revision: 264673
URL: http://svn.apache.org/viewcvs?rev=264673&view=rev
Log:
Fixed breakages caused by elimination of RollerSession.getCurrentWebsite()
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/pojos/PersistentObject.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/CategoryDeleteForm.java
incubator/roller/branches/roller_2.0/tests/org/roller/presentation/StrutsActionTestBase.java
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp
Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/PersistentObject.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/PersistentObject.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/PersistentObject.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/PersistentObject.java Mon Aug 29 19:25:49 2005
@@ -66,10 +66,6 @@
{
return true;
}
- /** Start editing this object */
- public void startEditing() throws RollerException
- {
- if (!canSave()) throw new RollerException("ERROR: edit permission denied");
- }
+
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java Mon Aug 29 19:25:49 2005
@@ -89,10 +89,10 @@
public static final String WEBLOGENTRYID_KEY = "entryid";
- public static final String WEBLOGCATEGORYID_KEY = "catId";
+ public static final String WEBLOGCATEGORYID_KEY = "categoryId";
public static final String PINGTARGETID_KEY = "pingtargetId";
public static final String REFERERID_KEY = "refId";
- public static final String WEBLOGCOMMENTID_KEY = "catId";
+ public static final String WEBLOGCOMMENTID_KEY = "commentId";
public static final String WEBSITEID_KEY = "websiteId";
public static final String BOOKMARKID_KEY = "bookmarkId";
public static final String FOLDERID_KEY = "folderId";
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java Mon Aug 29 19:25:49 2005
@@ -12,12 +12,13 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.roller.RollerPermissionsException;
import org.roller.model.BookmarkManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.BookmarkData;
import org.roller.pojos.FolderData;
+import org.roller.pojos.PermissionsData;
import org.roller.presentation.RollerRequest;
+import org.roller.presentation.RollerSession;
import org.roller.presentation.bookmarks.formbeans.BookmarkFormEx;
/**
@@ -37,35 +38,33 @@
throws Exception
{
ActionForward forward = mapping.findForward("Bookmarks");
- try
+ BookmarkFormEx form = (BookmarkFormEx)actionForm;
+ RollerRequest rreq = RollerRequest.getRollerRequest(request);
+ BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+
+ BookmarkData bd = null;
+ if (null != form.getId() && !form.getId().trim().equals(""))
+ {
+ bd = bmgr.retrieveBookmark(form.getId());
+ }
+ else
+ {
+ bd = bmgr.createBookmark();
+ FolderData fd = bmgr.retrieveFolder(
+ request.getParameter(RollerRequest.FOLDERID_KEY));
+ bd.setFolder(fd);
+ }
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if (bd.getFolder().getWebsite().hasUserPermissions(
+ rses.getAuthenticatedUser(), PermissionsData.AUTHOR))
{
- BookmarkFormEx form = (BookmarkFormEx)actionForm;
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
-
- BookmarkData bd = null;
- if (null != form.getId() && !form.getId().trim().equals(""))
- {
- bd = bmgr.retrieveBookmark(form.getId());
- bd.startEditing(); // should throw if save not permitted
- }
- else
- {
- bd = bmgr.createBookmark();
-
- // Existing bookmarks already have folders, but this is a new one.
- FolderData fd = bmgr.retrieveFolder(
- request.getParameter(RollerRequest.FOLDERID_KEY));
- bd.setFolder(fd);
- }
form.copyTo(bd, request.getLocale());
bd.save();
- RollerFactory.getRoller().commit();
-
+ RollerFactory.getRoller().commit();
request.setAttribute(
- RollerRequest.FOLDERID_KEY,bd.getFolder().getId());
+ RollerRequest.FOLDERID_KEY, bd.getFolder().getId());
}
- catch (RollerPermissionsException e)
+ else
{
ActionErrors errors = new ActionErrors();
errors.add(null, new ActionError("error.permissions.deniedSave"));
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java Mon Aug 29 19:25:49 2005
@@ -47,8 +47,10 @@
form.copyFrom(fd, request.getLocale());
parentFolder = fd.getParent();
- request.setAttribute("model", new BasePageModel(
- "folderForm.add.title", request, response, mapping));
+ BasePageModel pageModel = new BasePageModel(
+ "folderForm.add.title", request, response, mapping);
+ pageModel.setWebsite(parentFolder.getWebsite());
+ request.setAttribute("model", pageModel);
}
else if (null != request.getParameter("correct"))
{
@@ -57,9 +59,11 @@
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
parentFolder = bmgr.retrieveFolder(parentId);
-
- request.setAttribute("model", new BasePageModel(
- "folderForm.correct.title", request, response, mapping));
+
+ BasePageModel pageModel = new BasePageModel(
+ "folderForm.correct.title", request, response, mapping);
+ pageModel.setWebsite(parentFolder.getWebsite());
+ request.setAttribute("model", pageModel);
}
else
{
@@ -69,8 +73,10 @@
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
parentFolder = bmgr.retrieveFolder(parentId);
- request.setAttribute("model", new BasePageModel(
- "folderForm.add.title", request, response, mapping));
+ BasePageModel pageModel = new BasePageModel(
+ "folderForm.add.title", request, response, mapping);
+ pageModel.setWebsite(parentFolder.getWebsite());
+ request.setAttribute("model", pageModel);
}
request.setAttribute(RollerRequest.PARENTID_KEY, parentFolder.getId());
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java Mon Aug 29 19:25:49 2005
@@ -12,11 +12,10 @@
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.RollerPermissionsException;
import org.roller.model.BookmarkManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.FolderData;
+import org.roller.pojos.PermissionsData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
@@ -42,61 +41,40 @@
FolderFormEx form = (FolderFormEx)actionForm;
RollerRequest rreq = RollerRequest.getRollerRequest(request);
RollerSession rses = RollerSession.getRollerSession(request);
- WebsiteData wd = rreq.getWebsite();
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
-
+ WebsiteData website = null;
+
FolderData fd = null;
if (null != form.getId() && !form.getId().trim().equals(""))
{
fd = bmgr.retrieveFolder(form.getId());
- fd.save(); // should throw if save not permitted
+ website = fd.getWebsite();
}
else
{
- fd = bmgr.createFolder();
-
+ fd = bmgr.createFolder();
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
- FolderData parent = null;
- if (null != parentId && !parentId.trim().equalsIgnoreCase("null"))
- {
- parent = bmgr.retrieveFolder(parentId);
- }
- else
- {
- parent = bmgr.getRootFolder(wd);
- }
+ FolderData parent = bmgr.retrieveFolder(parentId);
+ website = parent.getWebsite();
fd.setParent(parent);
- fd.setWebsite(wd);
+ fd.setWebsite(website);
}
- // Copy form values to object
- form.copyTo(fd, request.getLocale());
-
- try
+ if (fd.getWebsite().hasUserPermissions(
+ rses.getAuthenticatedUser(), PermissionsData.AUTHOR))
{
- // Store object and commit
+ // Copy form values to object
+ form.copyTo(fd, request.getLocale());
fd.save();
RollerFactory.getRoller().commit();
}
- catch (RollerPermissionsException e)
+ else
{
ActionErrors errors = new ActionErrors();
errors.add(null, new ActionError("error.permissions.deniedSave"));
saveErrors(request, errors);
forward = mapping.findForward("access-denied");
- }
- catch (RollerException re)
- {
- RollerFactory.getRoller().rollback();
- ActionErrors errors = new ActionErrors();
- String msg = (null != re.getRootCause())
- ? re.getRootCause().toString()
- : re.toString();
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("folderForm.save.exception", msg));
- saveErrors(request,errors);
- }
-
+ }
if (null != fd.getParent())
{
request.setAttribute(
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java Mon Aug 29 19:25:49 2005
@@ -24,8 +24,8 @@
/**
* @struts.action path="/editor/categoryDelete" name="categoryDeleteForm"
- * @struts.action-forward name="CategoryDeleteOK" path=.CategoryDeleteOK"
- *
+ * @struts.action-forward name="CategoryDeleteOK" path=".CategoryDeleteOK"
+ *
* @author Dave Johnson
*/
public class CategoryDeleteAction extends Action
@@ -37,11 +37,11 @@
HttpServletResponse response)
throws Exception
{
- ActionForward forward = null;
+ ActionForward forward = mapping.findForward("categories");
CategoryDeleteForm form = (CategoryDeleteForm)actionForm;
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- String catid = request.getParameter("catid");
+ String catid = request.getParameter(RollerRequest.WEBLOGCATEGORYID_KEY);
WeblogCategoryData catToDelete =
wmgr.retrieveWeblogCategory(catid);
RollerSession rses = RollerSession.getRollerSession(request);
@@ -56,10 +56,9 @@
{
// Present CategoryDeleteOK? page to user
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- WebsiteData website = rreq.getWebsite();
WeblogCategoryData theCat = wmgr.retrieveWeblogCategory(catid);
Iterator allCats =
- wmgr.getWeblogCategories(website).iterator();
+ wmgr.getWeblogCategories(theCat.getWebsite()).iterator();
List destCats = new LinkedList();
while (allCats.hasNext())
{
@@ -76,7 +75,7 @@
if (destCats.size() > 0)
{
form.setName(theCat.getName());
- form.setCatid(catid);
+ form.setCategoryId(catid);
form.setCats(destCats);
form.setInUse(Boolean.valueOf(catToDelete.isInUse()));
forward = mapping.findForward("CategoryDeleteOK");
@@ -89,7 +88,6 @@
request.setAttribute(
RollerRequest.WEBLOGCATEGORYID_KEY, returnId);
}
- forward = mapping.findForward("categories");
}
}
else if (form.isDelete().booleanValue())
@@ -111,7 +109,6 @@
request.setAttribute(
RollerRequest.WEBLOGCATEGORYID_KEY, returnId);
}
- forward = mapping.findForward("categories");
}
else
{
@@ -121,7 +118,6 @@
request.setAttribute(
RollerRequest.WEBLOGCATEGORYID_KEY, returnId);
}
- forward = mapping.findForward("categories");
}
}
else
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java Mon Aug 29 19:25:49 2005
@@ -62,21 +62,23 @@
WeblogCategoryData cd = rreq.getWeblogCategory();
request.setAttribute("state","correcting");
- parentCat = wmgr.retrieveWeblogCategory(rreq.getWeblogCategory().getId());
+ parentCat = wmgr.retrieveWeblogCategory(cd.getId());
pageModel = new BasePageModel(
"categoryForm.correct.title", request, response, mapping);
+ pageModel.setWebsite(cd.getWebsite());
}
else
{
// We are adding a new Category
request.setAttribute("state","add");
- // Cat is specified by request param, pass it on as attribute.
- String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
- form.setParentId(parentId);
+ String pid = request.getParameter(RollerRequest.PARENTID_KEY);
+ parentCat = wmgr.retrieveWeblogCategory(pid);
+ form.setParentId(parentCat.getId());
pageModel = new BasePageModel(
"categoryForm.add.title", request, response, mapping);
+ pageModel.setWebsite(parentCat.getWebsite());
}
// Build cat path for display on page
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java Mon Aug 29 19:25:49 2005
@@ -12,9 +12,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.roller.RollerPermissionsException;
import org.roller.model.RollerFactory;
import org.roller.model.WeblogManager;
+import org.roller.pojos.PermissionsData;
import org.roller.pojos.WeblogCategoryData;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
@@ -24,8 +24,6 @@
* @struts.action path="/editor/categorySave" name="weblogCategoryFormEx"
* validate="true" input="/editor/categoryEdit.do"
*
- * @struts.action-forward name="Categories" path="/editor/categories.do?method=selectCategory"
- *
* @author Dave Johnson
*/
public class CategorySaveAction extends Action
@@ -37,41 +35,42 @@
HttpServletResponse response)
throws Exception
{
- ActionForward forward = mapping.findForward("Categories");
- try
+ ActionForward forward = mapping.findForward("categories");
+ WeblogCategoryFormEx form = (WeblogCategoryFormEx)actionForm;
+ RollerRequest rreq = RollerRequest.getRollerRequest(request);
+ WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+
+ WeblogCategoryData cd = null;
+ if (null != form.getId() && !form.getId().trim().equals(""))
+ {
+ cd = wmgr.retrieveWeblogCategory(form.getId());
+ }
+ else
+ {
+ cd = wmgr.createWeblogCategory();
+ String pid = form.getParentId();
+ WeblogCategoryData parentCat = wmgr.retrieveWeblogCategory(pid);
+ cd.setWebsite(parentCat.getWebsite());
+ cd.setParent(parentCat);
+ }
+
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if (cd.getWebsite().hasUserPermissions(
+ rses.getAuthenticatedUser(), PermissionsData.AUTHOR))
{
- WeblogCategoryFormEx form = (WeblogCategoryFormEx)actionForm;
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-
- WeblogCategoryData cd = null;
- if (null != form.getId() && !form.getId().trim().equals(""))
- {
- cd = wmgr.retrieveWeblogCategory(form.getId());
- cd.save(); // should throw if save not permitted
- }
- else
- {
- cd = wmgr.createWeblogCategory();
- cd.setWebsite(rreq.getWebsite());
-
- String parentId = form.getParentId();
- cd.setParent(wmgr.retrieveWeblogCategory(parentId));
- }
form.copyTo(cd, request.getLocale());
cd.save();
RollerFactory.getRoller().commit();
-
- request.setAttribute(
- RollerRequest.WEBLOGCATEGORYID_KEY, cd.getParent().getId());
}
- catch (RollerPermissionsException e)
+ else
{
ActionErrors errors = new ActionErrors();
errors.add(null, new ActionError("error.permissions.deniedSave"));
saveErrors(request, errors);
forward = mapping.findForward("access-denied");
}
+ request.setAttribute(
+ RollerRequest.WEBLOGCATEGORYID_KEY, cd.getParent().getId());
return forward;
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Mon Aug 29 19:25:49 2005
@@ -144,20 +144,21 @@
RollerSession rses = RollerSession.getRollerSession(request);
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
WeblogEntryData entry = rreq.getWeblogEntry();
+ WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
+ if (entry == null && form.getId() != null)
+ {
+ entry = wmgr.retrieveWeblogEntry(form.getId());
+ }
if (rses.isUserAuthorizedToAuthor(entry.getWebsite())
- || (rses.isUserAuthorized(entry.getWebsite()) && entry.isDraft()))
+ || (rses.isUserAuthorized(entry.getWebsite()) && entry.isDraft()))
{
- WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
- if (entry == null && form.getId() != null)
- {
- entry= wmgr.retrieveWeblogEntry(form.getId());
- }
form.copyFrom(entry, request.getLocale());
-
- request.setAttribute("model",
- new WeblogEntryPageModel(request, response, mapping,
- form, WeblogEntryPageModel.EDIT_MODE));
+ WeblogEntryPageModel pageModel = new WeblogEntryPageModel(
+ request, response, mapping, form,
+ WeblogEntryPageModel.EDIT_MODE);
+ pageModel.setWebsite(entry.getWebsite());
+ request.setAttribute("model", pageModel);
}
else
{
@@ -594,8 +595,8 @@
|| (rses.isUserAuthorized(wd.getWebsite()) && wd.isDraft()) )
{
// Flush the page cache
- PageCacheFilter.removeFromCache(
- request, wd.getWebsite());
+ PageCacheFilter.removeFromCache(request, wd.getWebsite());
+
// remove the index for it
wd.setStatus(WeblogEntryData.DRAFT);
reindexEntry(RollerFactory.getRoller(), wd);
@@ -612,6 +613,8 @@
uiMessages.add(null,
new ActionMessage("weblogEdit.entryRemoved"));
saveMessages(request, uiMessages);
+
+ RollerRequest.getRollerRequest().setWebsite(wd.getWebsite());
}
else
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/CategoryDeleteForm.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/CategoryDeleteForm.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/CategoryDeleteForm.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/CategoryDeleteForm.java Mon Aug 29 19:25:49 2005
@@ -13,7 +13,7 @@
public class CategoryDeleteForm extends ActionForm
{
private String name;
- private String catid = null;
+ private String categoryId = null;
private String moveToWeblogCategoryId = null;
private List cats = null;
private Boolean inUse = Boolean.FALSE;
@@ -30,9 +30,9 @@
/**
* @return
*/
- public String getCatid()
+ public String getCategoryId()
{
- return catid;
+ return categoryId;
}
/**
@@ -62,9 +62,9 @@
/**
* @param string
*/
- public void setCatid(String string)
+ public void setCategoryId(String string)
{
- catid = string;
+ categoryId = string;
}
/**
Modified: incubator/roller/branches/roller_2.0/tests/org/roller/presentation/StrutsActionTestBase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/presentation/StrutsActionTestBase.java?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/presentation/StrutsActionTestBase.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/presentation/StrutsActionTestBase.java Mon Aug 29 19:25:49 2005
@@ -60,7 +60,6 @@
UserManager umgr = getRoller().getUserManager();
UserData user = umgr.getUser(username);
WebsiteData website = (WebsiteData)umgr.getWebsites(user, null).get(0);
- rollerSession.setCurrentWebsite(website);
session.setAttribute(RollerSession.ROLLER_SESSION, rollerSession);
}
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml Mon Aug 29 19:25:49 2005
@@ -117,19 +117,19 @@
<put name="content" value="/website/upload-file.jsp" />
</definition>
-<definition name=".WeblogEntryRemove" extends=".tiles-editorpage" >
+<definition name=".WeblogEntryRemove" extends=".tiles-simplepage" >
<put name="content" value="/weblog/WeblogEntryRemove.jsp" />
</definition>
-<definition name=".CategoryForm" extends=".tiles-editorpage" >
+<definition name=".CategoryForm" extends=".tiles-simplepage" >
<put name="content" value="/weblog/CategoryForm.jsp" />
</definition>
-<definition name=".CategoryDeleteOK" extends=".tiles-editorpage" >
+<definition name=".CategoryDeleteOK" extends=".tiles-simplepage" >
<put name="content" value="/weblog/CategoryDeleteOK.jsp" />
</definition>
-<definition name=".BookmarkForm" extends=".tiles-editorpage" >
+<definition name=".BookmarkForm" extends=".tiles-simplepage" >
<put name="content" value="/bookmarks/BookmarkForm.jsp" />
</definition>
-<definition name=".FolderForm" extends=".tiles-editorpage" >
+<definition name=".FolderForm" extends=".tiles-simplepage" >
<put name="content" value="/bookmarks/FolderForm.jsp" />
</definition>
<definition name=".import" extends=".tiles-editorpage" >
@@ -164,22 +164,22 @@
<put name="content" value="/weblog/Pings.jsp" />
</definition>
-<definition name=".CustomPingTargetDeleteOK" extends=".tiles-editorpage" >
+<definition name=".CustomPingTargetDeleteOK" extends=".tiles-simplepage" >
<put name="content" value="/weblog/CustomPingTargetDeleteOK.jsp" />
</definition>
-<definition name=".CustomPingTargetEdit" extends=".tiles-editorpage" >
+<definition name=".CustomPingTargetEdit" extends=".tiles-simplepage" >
<put name="content" value="/weblog/CustomPingTargetEdit.jsp" />
</definition>
-<definition name=".InviteMember" extends=".tiles-editorpage" >
+<definition name=".InviteMember" extends=".tiles-simplepage" >
<put name="content" value="/website/InviteMember.jsp" />
</definition>
-<definition name=".InviteMemberDone" extends=".tiles-editorpage" >
+<definition name=".InviteMemberDone" extends=".tiles-simplepage" >
<put name="content" value="/website/InviteMemberDone.jsp" />
</definition>
-<definition name=".edit-page" extends=".tiles-editorpage" >
+<definition name=".edit-page" extends=".tiles-simplepage" >
<put name="content" value="/website/edit-page.jsp" />
</definition>
-<definition name=".remove-page" extends=".tiles-editorpage" >
+<definition name=".remove-page" extends=".tiles-simplepage" >
<put name="content" value="/website/remove-page.jsp" />
</definition>
@@ -196,14 +196,14 @@
<put name="content" value="/website/CommonPingTargets.jsp" />
</definition>
-<definition name=".CommonPingTargetDeleteOK" extends=".tiles-adminpage" >
+<definition name=".CommonPingTargetDeleteOK" extends=".tiles-simplepage" >
<put name="content" value="/website/CommonPingTargetDeleteOK.jsp" />
</definition>
-<definition name=".CommonPingTargetEdit" extends=".tiles-adminpage" >
+<definition name=".CommonPingTargetEdit" extends=".tiles-simplepage" >
<put name="content" value="/website/CommonPingTargetEdit.jsp" />
</definition>
-<definition name=".UserNew" extends=".tiles-adminpage" >
+<definition name=".UserNew" extends=".tiles-simplepage" >
<put name="content" value="/website/UserNew.jsp" />
</definition>
Modified: incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp Mon Aug 29 19:25:49 2005
@@ -9,13 +9,19 @@
<p class="subtitle">
<c:if test="${state == 'add'}">
- <fmt:message key="folderForm.add.subtitle" /></h3>
+ <fmt:message key="folderForm.add.subtitle" >
+ <fmt:param value="${folderName}" />
+ </fmt:message>
</c:if>
<c:if test="${state == 'edit'}">
- <fmt:message key="folderForm.edit.subtitle" />
+ <fmt:message key="folderForm.edit.subtitle" >
+ <fmt:param value="${folderName}" />
+ </fmt:message>
</c:if>
<c:if test="${state == 'correct'}">
- <fmt:message key="folderForm.correct.subtitle" />
+ <fmt:message key="folderForm.correct.subtitle" >
+ <fmt:param value="${folderName}" />
+ </fmt:message>
</c:if>
</p>
Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp Mon Aug 29 19:25:49 2005
@@ -24,6 +24,7 @@
</div>
<div id="centercontent">
+ <h1><c:out value="${model.title}" /></h1>
<tiles:insert attribute="messages" />
<tiles:insert attribute="content" />
<div id="footer">
Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp Mon Aug 29 19:25:49 2005
@@ -58,6 +58,7 @@
<html:form action="/editor/categories" method="post">
<input type="hidden" name="method" />
+<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
<html:hidden property="parentId" />
<%-- Select-all button --%>
Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp?rev=264673&r1=264672&r2=264673&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp Mon Aug 29 19:25:49 2005
@@ -25,7 +25,7 @@
<html:form action="/editor/categoryDelete" method="post">
- <html:hidden property="catId" />
+ <html:hidden property="categoryId" />
<html:hidden property="confirmDelete" />
<c:if test="${categoryDeleteForm.inUse}" >