Author: snoopdave
Date: Mon Mar 20 12:17:05 2006
New Revision: 387296
URL: http://svn.apache.org/viewcvs?rev=387296&view=rev
Log:
Fixes ROL-1091, limited authors may now preview entries
Modified:
incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
Modified:
incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=387296&r1=387295&r2=387296&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
(original)
+++
incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
Mon Mar 20 12:17:05 2006
@@ -144,7 +144,7 @@
request.setAttribute("javax.servlet.error.message",
resources.getString("weblogEntry.notFound"));
forward = mapping.findForward("error");
- } else if (rses.isUserAuthorizedToAuthor(entry.getWebsite())
+ } else if (rses.isUserAuthorized(entry.getWebsite())
|| (rses.isUserAuthorized(entry.getWebsite()) &&
!entry.isPublished())) {
form.copyFrom(entry, request.getLocale());
WeblogEntryPageModel pageModel = new WeblogEntryPageModel(
@@ -204,7 +204,7 @@
RollerSession.getRollerSession(request);
WeblogEntryPageModel pageModel = new WeblogEntryPageModel(
request, response, mapping, (WeblogEntryFormEx)actionForm,
mode);
- if (rollerSession.isUserAuthorizedToAuthor(
+ if (rollerSession.isUserAuthorized(
pageModel.getWeblogEntry().getWebsite())) {
request.setAttribute("model", pageModel);
} else {
@@ -660,7 +660,7 @@
WebsiteData site = umgr.retrieveWebsite(wf.getWebsiteId());
RollerSession rses =
RollerSession.getRollerSession(request);
- if ( rses.isUserAuthorizedToAuthor(site) ) {
+ if ( rses.isUserAuthorized(site) ) {
HttpSession session = request.getSession(true);
// we need to save any new entries before SpellChecking