Author: agilliland
Date: Mon Jun 4 16:07:23 2007
New Revision: 544322
URL: http://svn.apache.org/viewvc?view=rev&rev=544322
Log:
fix bug in file resources action where resource url links were not pointing to
the real resources.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java?view=diff&rev=544322&r1=544321&r2=544322
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
Mon Jun 4 16:07:23 2007
@@ -299,42 +299,11 @@
}
- public class WeblogResourceComparator implements Comparator {
- public int compare(Object o1, Object o2) {
- ThemeResource r1 = (ThemeResource)o1;
- ThemeResource r2 = (ThemeResource)o2;
-
- // consider directories so they go to the top of the list
- if(r1.isDirectory() && r2.isDirectory()) {
- // if we have 2 directories then just go by name
- return r1.getPath().compareTo(r2.getPath());
- } else if(r1.isDirectory()) {
- // directories go before files
- return -1;
- } else if(r2.isDirectory()) {
- // directories go before files
- return 1;
- } else {
- // if we have 2 files then just go by name
- return r1.getPath().compareTo(r2.getPath());
- }
- }
- public boolean equals(Object o1, Object o2) {
- ThemeResource r1 = (ThemeResource)o1;
- ThemeResource r2 = (ThemeResource)o2;
-
- // need to be same type to be equals, i.e both files or directories
- if((r1.isDirectory() && !r2.isDirectory()) ||
- (r1.isFile() && !r2.isFile())) {
- return false;
- }
-
- // after that it's just a matter of comparing paths
- return r1.getPath().equals(r2.getPath());
- }
+ public String getResourceURL(String path) {
+ return URLUtilities.getWeblogResourceURL(getActionWeblog(), path,
false);
}
-
+
public String getPath() {
return path;
}
@@ -409,6 +378,42 @@
public void setUploadedFilesFileName(String[] uploadedFilesFileName) {
this.uploadedFilesFileName = uploadedFilesFileName;
+ }
+
+
+ public class WeblogResourceComparator implements Comparator {
+ public int compare(Object o1, Object o2) {
+ ThemeResource r1 = (ThemeResource)o1;
+ ThemeResource r2 = (ThemeResource)o2;
+
+ // consider directories so they go to the top of the list
+ if(r1.isDirectory() && r2.isDirectory()) {
+ // if we have 2 directories then just go by name
+ return r1.getPath().compareTo(r2.getPath());
+ } else if(r1.isDirectory()) {
+ // directories go before files
+ return -1;
+ } else if(r2.isDirectory()) {
+ // directories go before files
+ return 1;
+ } else {
+ // if we have 2 files then just go by name
+ return r1.getPath().compareTo(r2.getPath());
+ }
+ }
+ public boolean equals(Object o1, Object o2) {
+ ThemeResource r1 = (ThemeResource)o1;
+ ThemeResource r2 = (ThemeResource)o2;
+
+ // need to be same type to be equals, i.e both files or directories
+ if((r1.isDirectory() && !r2.isDirectory()) ||
+ (r1.isFile() && !r2.isFile())) {
+ return false;
+ }
+
+ // after that it's just a matter of comparing paths
+ return r1.getPath().equals(r2.getPath());
+ }
}
}
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp?view=diff&rev=544322&r1=544321&r2=544322
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp Mon Jun
4 16:07:23 2007
@@ -166,7 +166,7 @@
</s:if>
<s:else>
<img src='<s:url value="/images/image.png"/>'
style="padding:0px" />
- <a href='<c:out value="${model.resourcesBaseURL}"
/><s:property value="#f.path" />'>
+ <a href='<c:out value="${model.resourcesBaseURL}"
/><s:property value="getResourceURL(#f.path)" />'>
<s:property value="#f.name" />
</a>
</s:else>
