roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1603474 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
Date Wed, 18 Jun 2014 15:00:18 GMT
Author: ghuber
Date: Wed Jun 18 15:00:17 2014
New Revision: 1603474

URL: http://svn.apache.org/r1603474
Log:
Errors on selection

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java?rev=1603474&r1=1603473&r2=1603474&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
Wed Jun 18 15:00:17 2014
@@ -107,6 +107,10 @@ public class EntriesBean {
         this.status = status;
     }
     
+    public void setSortBy(WeblogEntrySearchCriteria.SortBy sortBy) {
+        this.sortBy = sortBy;
+    }
+    
     public WeblogEntrySearchCriteria.SortBy getSortBy() {
         return sortBy;
     }
@@ -118,22 +122,6 @@ public class EntriesBean {
     public void setPage(int page) {
         this.page = page;
     }
-    
-    
-    public String toString() {
-        StringBuilder buf = new StringBuilder();
-        
-        buf.append("startDate = ").append(getStartDate()).append("\n");
-        buf.append("endDate = ").append(getEndDate()).append("\n");
-        buf.append("status = ").append(getStatus()).append("\n");
-        buf.append("sortBy = ").append(getSortBy()).append("\n");
-        buf.append("catName = ").append(getCategoryName()).append("\n");
-        buf.append("tags = ").append(getTagsAsString()).append("\n");
-        buf.append("text = ").append(getText()).append("\n");
-        buf.append("page = ").append(getPage()).append("\n");
-        
-        return buf.toString();
-    }
 
     public String getEndDateString() {
         return endDateString;
@@ -151,4 +139,20 @@ public class EntriesBean {
         this.startDateString = startDateString;
     }
     
+    //------------------------------------------------------- Good citizenship
+    
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        
+        buf.append("startDate = ").append(getStartDate()).append("\n");
+        buf.append("endDate = ").append(getEndDate()).append("\n");
+        buf.append("status = ").append(getStatus()).append("\n");
+        buf.append("sortBy = ").append(getSortBy()).append("\n");
+        buf.append("catName = ").append(getCategoryName()).append("\n");
+        buf.append("tags = ").append(getTagsAsString()).append("\n");
+        buf.append("text = ").append(getText()).append("\n");
+        buf.append("page = ").append(getPage()).append("\n");
+        
+        return buf.toString();
+    }
 }

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp?rev=1603474&r1=1603473&r2=1603474&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp Wed Jun 18 15:00:17
2014
@@ -36,8 +36,6 @@
                 <s:form action="entries">
 					<s:hidden name="salt" />
                     <s:hidden name="weblog" />
-                    <s:hidden name="bean.count" />
-                    <s:hidden name="bean.offset" />
 
                     <%-- ========================================================= --%>
                     <%-- filter by category --%>
@@ -45,7 +43,7 @@
                     <div class="sideformrow">
                         <label for="categoryId" class="sideformrow">
                         <s:text name="weblogEntryQuery.label.category" /></label>
-                        <s:select name="bean.categoryName" list="categories" listKey="path"
listValue="name" size="1" />
+                        <s:select name="bean.categoryName" list="categories" listKey="name"
listValue="name" size="1" />
                     </div>
                     <br />
                     <br />



Mime
View raw message