Return-Path:
Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org
Received: (qmail 74796 invoked from network); 9 Aug 2006 18:51:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
by minotaur.apache.org with SMTP; 9 Aug 2006 18:51:44 -0000
Received: (qmail 10480 invoked by uid 500); 9 Aug 2006 18:51:43 -0000
Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org
Received: (qmail 10452 invoked by uid 500); 9 Aug 2006 18:51:43 -0000
Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help:
List-Unsubscribe:
List-Post:
List-Id:
Reply-To: roller-dev@incubator.apache.org
Delivered-To: mailing list roller-commits@incubator.apache.org
Received: (qmail 10441 invoked by uid 99); 9 Aug 2006 18:51:43 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 11:51:43 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 11:51:43 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
id ED7E91A981A; Wed, 9 Aug 2006 11:51:22 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r430114 - in /incubator/roller/branches/roller_3.0:
src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
web/WEB-INF/jsps/authoring/edit-page.jsp
Date: Wed, 09 Aug 2006 18:51:21 -0000
To: roller-commits@incubator.apache.org
From: snoopdave@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060809185122.ED7E91A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N
Author: snoopdave
Date: Wed Aug 9 11:51:20 2006
New Revision: 430114
URL: http://svn.apache.org/viewvc?rev=430114&view=rev
Log:
Fixed bug that was allowing edits to properties of required templates
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java?rev=430114&r1=430113&r2=430114&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java Wed Aug 9 11:51:20 2006
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import javax.servlet.ServletException;
@@ -36,6 +34,7 @@
import org.apache.roller.RollerPermissionsException;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
+import org.apache.roller.pojos.Template;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
@@ -111,7 +110,7 @@
actionForm.reset(mapping,request);
- addModelObjects(request, response, mapping, website);
+ addModelObjects(request, response, mapping, website, data);
} else {
forward = mapping.findForward("access-denied");
}
@@ -144,7 +143,7 @@
WeblogTemplateForm pf = (WeblogTemplateForm)actionForm;
pf.copyFrom(pd, request.getLocale());
- addModelObjects(request, response, mapping, pd.getWebsite());
+ addModelObjects(request, response, mapping, pd.getWebsite(), pd);
} else {
forward = mapping.findForward("access-denied");
}
@@ -178,7 +177,7 @@
}
if ( rses.isUserAuthorizedToAdmin(website)) {
- addModelObjects(request, response, mapping, website);
+ addModelObjects(request, response, mapping, website, null);
} else {
forward = mapping.findForward("access-denied");
}
@@ -221,7 +220,7 @@
}
addModelObjects(
- request, response, mapping, template.getWebsite());
+ request, response, mapping, template.getWebsite(), template);
actionForm.reset(mapping, request);
} else {
forward = mapping.findForward("access-denied");
@@ -256,7 +255,7 @@
WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
form.copyFrom(page, request.getLocale());
- addModelObjects(request, response, mapping, page.getWebsite());
+ addModelObjects(request, response, mapping, page.getWebsite(), page);
BasePageModel pageModel = new BasePageModel(
"editPages.title.removeOK", request, response, mapping);
@@ -311,10 +310,13 @@
CacheManager.invalidate(data);
+ addModelObjects(request, response, mapping, data.getWebsite(), data);
+
BasePageModel pageModel = new BasePageModel(
"pageForm.title", request, response, mapping);
pageModel.setWebsite(website);
request.setAttribute("model", pageModel);
+
} else {
forward = mapping.findForward("access-denied");
}
@@ -377,7 +379,8 @@
HttpServletRequest request,
HttpServletResponse response,
ActionMapping mapping,
- WebsiteData website)
+ WebsiteData website,
+ WeblogTemplate page)
throws RollerException {
UserManager mgr = RollerFactory.getRoller().getUserManager();
RollerSession rses = RollerSession.getRollerSession(request);
@@ -392,7 +395,7 @@
List pages = mgr.getPages(website);
request.setAttribute("pages", pages);
- request.setAttribute("page", rreq.getPage());
+ if (page != null) request.setAttribute("page", page);
}
}
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp?rev=430114&r1=430113&r2=430114&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp Wed Aug 9 11:51:20 2006
@@ -33,7 +33,6 @@
:
-