Disallow empty album titles, too.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / KnownSonesPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index d001ea7..beda638 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - KnownSonesPage.java - Copyright © 2010–2012 David Roden
+ * Sone - KnownSonesPage.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,6 +41,9 @@ import com.google.common.collect.Ordering;
  */
 public class KnownSonesPage extends SoneTemplatePage {
 
+       private static final String defaultSortField = "activity";
+       private static final String defaultSortOrder = "desc";
+
        /**
         * Creates a “known Sones” page.
         *
@@ -63,11 +66,11 @@ public class KnownSonesPage extends SoneTemplatePage {
        @Override
        protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                super.processTemplate(request, templateContext);
-               String sortField = request.getHttpRequest().getParam("sort");
-               String sortOrder = request.getHttpRequest().getParam("order");
+               String sortField = request.getHttpRequest().getParam("sort", defaultSortField);
+               String sortOrder = request.getHttpRequest().getParam("order", defaultSortOrder);
                String filter = request.getHttpRequest().getParam("filter");
-               templateContext.set("sort", (sortField != null) ? sortField : "name");
-               templateContext.set("order", (sortOrder != null) ? sortOrder : "asc");
+               templateContext.set("sort", sortField);
+               templateContext.set("order", sortOrder);
                templateContext.set("filter", filter);
                final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
                Collection<Sone> knownSones = Collections2.filter(webInterface.getCore().getSones(), Sone.EMPTY_SONE_FILTER);