Merge branch 'issue862'

Conflicts:
	app/controllers/SearchController.java

Author: DJCordhose

app/controllers/SearchController.java

@@ -38,7 +38,6 @@
 import org.graylog2.restclient.models.api.results.DateHistogramResult;
 import org.graylog2.restclient.models.api.results.SearchResult;
 import org.joda.time.DateTime;
-import org.joda.time.DateTimeConstants;
 import org.joda.time.Minutes;
 import play.mvc.Result;
 import views.helpers.Permissions;
@@ -139,10 +138,10 @@ public Result index(String q,
     protected String determineHistogramResolution(final SearchResult searchResult) {
         final String interval;
         final int queryRangeInMinutes = Minutes.minutesBetween(searchResult.getFromDateTime(), searchResult.getToDateTime()).getMinutes();
-        final int HOUR = DateTimeConstants.MINUTES_PER_HOUR;
-        final int DAY = DateTimeConstants.MINUTES_PER_DAY;
-        final int WEEK = DateTimeConstants.MINUTES_PER_WEEK;
-        final int MONTH = DAY * 30;
+        final int HOUR = 60;
+        final int DAY = HOUR * 24;
+        final int WEEK = DAY * 7;
+        final int MONTH = HOUR * 24 * 30;
         final int YEAR = MONTH * 12;
 
         if (queryRangeInMinutes < DAY / 2) {

app/views/helpers/DateHistogramResolutionSelector.java

@@ -1,11 +1,13 @@
 package views.helpers;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.text.WordUtils;
 
 import lib.SearchTools;
 import play.mvc.Http;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Map;
 
 public class DateHistogramResolutionSelector {
@@ -23,11 +25,17 @@ public static String getOptions(String selected, Http.Request request) {
             url.append("?");
 
             for (Map.Entry<String, String[]> entry : queryParams.entrySet()) {
+
                 for (String value : entry.getValue()) {
-                    url.append(entry.getKey())
-                            .append("=")
-                            .append(value)
-                            .append("&");
+                    try {
+                        url.append(entry.getKey())
+                                .append("=")
+                                .append(java.net.URLEncoder.encode(value, Charsets.UTF_8.name()))
+                                .append("&");
+                    } catch (UnsupportedEncodingException e) {
+                        // UTF-8 *is* supported, but just in case...
+                        throw new RuntimeException(e);
+                    }
                 }
             }