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/09/20 23:02:17 UTC
svn commit: r290564 - in /incubator/roller/branches/roller_2.0:
src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
web/website/remove-page.jsp
Author: snoopdave
Date: Tue Sep 20 14:02:10 2005
New Revision: 290564
URL: http://svn.apache.org/viewcvs?rev=290564&view=rev
Log:
Fixes ROL-806, template remove broken
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
incubator/roller/branches/roller_2.0/web/website/remove-page.jsp
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=290564&r1=290563&r2=290564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Tue Sep 20 14:02:10 2005
@@ -159,12 +159,21 @@
ActionForward forward = mapping.findForward("editPages.page");
try
{
+ WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
RollerRequest rreq = RollerRequest.getRollerRequest(request);
RollerSession rses = RollerSession.getRollerSession(request);
request.setAttribute("model", new BasePageModel(
- "pagesForm.title", request, response, mapping));
+ "pagesForm.title", request, response, mapping));
+
WebsiteData website = rreq.getWebsite();
- if ( rses.isUserAuthorizedToAdmin(website) )
+ if (website == null && form.getId()!=null)
+ {
+ UserManager mgr = RollerFactory.getRoller().getUserManager();
+ WeblogTemplate template = mgr.retrievePage(form.getId());
+ website = template.getWebsite();
+ }
+
+ if ( rses.isUserAuthorizedToAdmin(website))
{
addModelObjects(request, response, mapping, website);
}
@@ -242,18 +251,23 @@
throws IOException, ServletException
{
ActionForward forward = mapping.findForward("removePage.page");
- request.setAttribute("model", new BasePageModel(
- "editPages.title.removeOK", request, response, mapping));
try
{
RollerSession rses = RollerSession.getRollerSession(request);
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- WeblogTemplate cd = (WeblogTemplate) rreq.getPage();
- WebsiteData website = cd.getWebsite();
+ WeblogTemplate page = (WeblogTemplate) rreq.getPage();
+ WebsiteData website = page.getWebsite();
if ( rses.isUserAuthorizedToAdmin(website) )
{
- WeblogTemplateForm pf = (WeblogTemplateForm)actionForm;
- pf.copyFrom(cd, request.getLocale());
+ WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
+ form.copyFrom(page, request.getLocale());
+
+ addModelObjects(request, response, mapping, page.getWebsite());
+
+ BasePageModel pageModel = new BasePageModel(
+ "editPages.title.removeOK", request, response, mapping);
+ pageModel.setWebsite(website);
+ request.setAttribute("model", pageModel);
UserData ud = rses.getAuthenticatedUser();
request.setAttribute("user",ud);
Modified: incubator/roller/branches/roller_2.0/web/website/remove-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/remove-page.jsp?rev=290564&r1=290563&r2=290564&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/remove-page.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/remove-page.jsp Tue Sep 20 14:02:10 2005
@@ -25,6 +25,7 @@
<input type="submit" value='<fmt:message key="application.yes" />' ></input>
<html:hidden property="method" value="remove"/></input>
<html:hidden property="id" /></input>
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
</html:form>
</td>
<td>
@@ -32,6 +33,7 @@
<input type="submit" value='<fmt:message key="application.no" />' ></input>
<html:hidden property="id" /></input>
<html:hidden property="method" value="cancel"/></input>
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
</html:form>
</td>
</tr>