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 2007/03/14 16:18:19 UTC
svn commit: r518175 - in /incubator/roller/branches/roller_3.1:
src/org/apache/roller/ui/rendering/util/ web/WEB-INF/jsps/authoring/
web/WEB-INF/jsps/tiles/
Author: snoopdave
Date: Wed Mar 14 08:18:17 2007
New Revision: 518175
URL: http://svn.apache.org/viewvc?view=rev&rev=518175
Log:
File upload and resource servlet fixes for bugs reported by Jon Stevens, plus footer URL changes
Modified:
incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogRequest.java
incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogResourceRequest.java
incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/UploadFile.jsp
incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/footer.jsp
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogRequest.java?view=diff&rev=518175&r1=518174&r2=518175
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogRequest.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogRequest.java Wed Mar 14 08:18:17 2007
@@ -131,7 +131,7 @@
* Convenience method which determines if the given string is a valid
* locale string.
*/
- private boolean isLocale(String potentialLocale) {
+ protected boolean isLocale(String potentialLocale) {
boolean isLocale = false;
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogResourceRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogResourceRequest.java?view=diff&rev=518175&r1=518174&r2=518175
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogResourceRequest.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/util/WeblogResourceRequest.java Wed Mar 14 08:18:17 2007
@@ -97,5 +97,10 @@
public void setResourcePath(String resourcePath) {
this.resourcePath = resourcePath;
}
-
+
+ protected boolean isLocale(String potentialLocale) {
+ // We don't support locales in the resource Servlet so we've got to
+ // keep parent from treating upload sub-directory name as a locale.
+ return false;
+ }
}
Modified: incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/UploadFile.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/UploadFile.jsp?view=diff&rev=518175&r1=518174&r2=518175
==============================================================================
--- incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/UploadFile.jsp (original)
+++ incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/UploadFile.jsp Wed Mar 14 08:18:17 2007
@@ -114,7 +114,9 @@
Create directory form
--%>
<c:if test="${model.showingRoot}">
-<form name="createSubdir" method="post" action="/roller-ui/authoring/uploadFiles.do">
+<% String create = RequestUtils.computeURL( pageContext,
+ "uploadFiles", null, null, null, new Hashtable(), null, false); %>
+<form name="createSubdir" method="post" action="<%= create %>">
<input type="hidden" name="method" value="createSubdir" />
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}"/>'>
<input type="hidden" name="path" value='<c:out value="${model.path}"/>'>
Modified: incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/footer.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/footer.jsp?view=diff&rev=518175&r1=518174&r2=518175
==============================================================================
--- incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/footer.jsp (original)
+++ incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/footer.jsp Wed Mar 14 08:18:17 2007
@@ -23,10 +23,10 @@
<a href="http://opensource2.atlassian.com/projects/roller/">
<fmt:message key="footer.reportIssue" /></a> |
-<a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
+<a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+User+Documentation">
<fmt:message key="footer.userGuide" /></a> |
-<a href="http://rollerweblogger.org/wiki/Wiki.jsp?page=RollerMailingLists">
+<a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">
<fmt:message key="footer.mailingLists" /></a>