Author: snoopdave
Date: Thu Aug 9 08:04:25 2007
New Revision: 564231
URL: http://svn.apache.org/viewvc?view=rev&rev=564231
Log:
Couple of APP fixes that are in in 3.1.1 RC1
Modified:
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
Modified:
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java?view=diff&rev=564231&r1=564230&r2=564231
==============================================================================
---
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
(original)
+++
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
Thu Aug 9 08:04:25 2007
@@ -89,7 +89,7 @@
ActionForward fwd = null;
// Ensure user is authorized to view comments in weblog
- if (rreq.getWebsite() != null &&
rses.isUserAuthorized(rreq.getWebsite())) {
+ if (rreq.getWebsite() != null &&
rses.isUserAuthorizedToAuthor(rreq.getWebsite())) {
fwd = mapping.findForward("commentManagement.page");
}
// Ensure only global admins can see all comments
Modified:
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java?view=diff&rev=564231&r1=564230&r2=564231
==============================================================================
---
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
(original)
+++
roller/branches/roller_3.1/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
Thu Aug 9 08:04:25 2007
@@ -816,7 +816,7 @@
IndexManager manager = roller.getIndexManager();
// remove entry before (re)adding it, or in case it isn't Published
- //manager.removeEntryIndexOperation(entry);
+ manager.removeEntryIndexOperation(entry);
// if published, index the entry
if (entry.isPublished()) {
Modified:
roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp?view=diff&rev=564231&r1=564230&r2=564231
==============================================================================
--- roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
(original)
+++ roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
Thu Aug 9 08:04:25 2007
@@ -18,7 +18,7 @@
<%@ include file="/taglibs.jsp" %>
<h2>
-<jsp:useBean id="weblogEntryFormEx" scope="session"
+<jsp:useBean id="weblogEntryFormEx" scope="request"
class="org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx"/>
<fmt:message key="weblogEntryRemove.removeWeblogEntry" /> [<jsp:getProperty
name="weblogEntryFormEx" property="title"/>]
</h2>
