You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/01 07:13:48 UTC
svn commit: r543393 - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
web/WEB-INF/jsps/editor/EntriesSidebar.jsp
Author: agilliland
Date: Thu May 31 22:13:47 2007
New Revision: 543393
URL: http://svn.apache.org/viewvc?view=rev&rev=543393
Log:
fix for ROL-1425. the category selector on the entries sidebar needs an option for "Any" at the top of the list.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=543393&r1=543392&r2=543393
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Thu May 31 22:13:47 2007
@@ -26,6 +26,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
@@ -112,6 +113,22 @@
}
return LIST;
+ }
+
+
+ public List<WeblogCategory> getCategories() {
+ // make list of categories with first option being being a transient
+ // category just meant to represent the default option of any category
+ List<WeblogCategory> cats = new ArrayList();
+
+ WeblogCategory tmpCat = new WeblogCategory();
+ tmpCat.setName("Any");
+ tmpCat.setPath("");
+ cats.add(tmpCat);
+
+ cats.addAll(getActionWeblog().getWeblogCategories());
+
+ return cats;
}
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp?view=diff&rev=543393&r1=543392&r2=543393
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp Thu May 31 22:13:47 2007
@@ -39,7 +39,7 @@
<div class="sideformrow">
<label for="categoryId" class="sideformrow">
<s:text name="weblogEntryQuery.label.category" /></label>
- <s:select name="bean.categoryPath" list="actionWeblog.weblogCategories" listKey="path" listValue="path" size="1" />
+ <s:select name="bean.categoryPath" list="categories" listKey="path" listValue="name" size="1" />
</div>
<br />
<br />