Fix bug when orderBy value is empty in issue list and board list

naver · Nov 7, 2014 · 4b56767 · 4b56767
1 parent 1e991f3
commit 4b56767
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/BoardApp.java b/app/controllers/BoardApp.java
@@ -32,6 +32,7 @@
 import models.enumeration.Operation;
 import models.enumeration.ResourceType;
 
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.node.ObjectNode;
 
 import play.data.Form;
@@ -66,7 +67,7 @@ private ExpressionList<Posting> asExpressionList(Project project) {
                 el.or(icontains("title", filter), icontains("body", filter));
             }
 
-            if (orderBy != null) {
+            if (StringUtils.isNotBlank(orderBy)) {
                 el.orderBy(orderBy + " " + orderDir);
             }
 

diff --git a/app/models/support/SearchCondition.java b/app/models/support/SearchCondition.java
@@ -199,7 +199,7 @@ public ExpressionList<Issue> asExpressionList() {
             el.eq("state", st);
         }
 
-        if (orderBy != null) {
+        if (StringUtils.isNotBlank(orderBy)) {
             if (orderBy.equals("dueDate")) {
                 String formulaName = orderDir.equals("asc") ? "dueDateAsc" : "dueDateDesc";
                 el.orderBy(formulaName + " " + orderDir);
@@ -310,7 +310,7 @@ public ExpressionList<Issue> asExpressionList(Project project) {
             el.add(LabelSearchUtil.createLabelSearchExpression(el.query(), labelIds));
         }
 
-        if (orderBy != null) {
+        if (StringUtils.isNotBlank(orderBy)) {
             if (orderBy.equals("dueDate")) {
                 String formulaName = orderDir.equals("asc") ? "dueDateAsc" : "dueDateDesc";
                 el.orderBy(formulaName + " " + orderDir);