Make days back filter a setting

diff --git a/releases.moxie b/releases.moxie
index 2b72bd224bd3e2602d3c3bd652a1bc926de04f19..0a73d5bbee5d2c6059d5c263cc0a37ce106d6bfb 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -35,6 +35,8 @@ r17: {
         - Improve Gerrit change ref decoration in the refs panel (issue 206)\r
         - Disable Gson's pretty printing which has a huge performance gain\r
         - Properly set application/json content-type on api calls\r
+        - Make days back filter choices a setting\r
+        - Changed default days back filter setting to 7 days\r
         - Improved page title\r
         - Updated Polish translation\r
         - Updated Japanese translation\r
@@ -105,6 +107,7 @@ r17: {
        - { name: 'mail.smtps', defaultValue: false }\r
        - { name: 'realm.salesforce.backingUserService', defaultValue: 'users.conf' }\r
        - { name: 'realm.salesforce.orgId', defaultValue: 0 }\r
+       - { name: 'web.activityDurationChoices', defaultValue: '7 14 28 60 90 180' }\r
        - { name: 'web.allowAppCloneLinks', defaultValue: true }\r
        - { name: 'web.forceDefaultLocale', defaultValue: ' ' }\r
        - { name: 'web.overviewPushCount', defaultValue: 5 }\r

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 82e77f3573e23b7405842e79eaacc3aa67993967..a6dc3158ca6521feac760144a4c344199f8180c3 100644 (file)
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -814,11 +814,17 @@ web.showSearchTypeSelection = false
 # SINCE 0.5.0 \r
 web.generateActivityGraph = true\r
 \r
-# The number of days to show on the activity page.\r
-# Value must exceed 0 else default of 14 is used\r
+# The default number of days to show on the activity page.\r
+# Value must exceed 0 else default of 7 is used\r
 #\r
 # SINCE 0.8.0\r
-web.activityDuration = 14\r
+web.activityDuration = 7\r
+\r
+# Choices for days of activity to display.\r
+#\r
+# SPACE-DELIMITED\r
+# SINCE 1.3.0\r
+web.activityDurationChoices = 7 14 28 60 90 180\r
 \r
 # The number of commits to display on the summary page\r
 # Value must exceed 0 else default of 20 is used\r

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 71f33b4a8c648ceab1eec4daaf496166cbf2e660..ceb40c132a8b1c99019a0ebe49de52afda1a946f 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -312,6 +312,19 @@ public class GitBlit implements ServletContextListener {
        public static int getInteger(String key, int defaultValue) {
                return self().settings.getInteger(key, defaultValue);
        }
+
+       /**
+        * Returns the integer list for the specified key. If the key does not
+        * exist or the value for the key can not be interpreted as an integer, an
+        * empty list is returned.
+        * 
+        * @see IStoredSettings.getIntegers(String key)
+        * @param key
+        * @return key value or defaultValue
+        */
+       public static List<Integer> getIntegers(String key) {
+               return self().settings.getIntegers(key);
+       }
        
        /**
         * Returns the value in bytes for the specified key. If the key does not

diff --git a/src/main/java/com/gitblit/IStoredSettings.java b/src/main/java/com/gitblit/IStoredSettings.java
index f0b1e6328ccf9d2c3dfef11aed8d8d0d5732ca63..acb9fc60a14a75d79045bcda63614070b6ffbd8c 100644 (file)
--- a/src/main/java/com/gitblit/IStoredSettings.java
+++ b/src/main/java/com/gitblit/IStoredSettings.java
@@ -260,6 +260,41 @@ public abstract class IStoredSettings {
                return strings;\r
        }\r
        \r
+       /**\r
+        * Returns a list of space-separated integers from the specified key.\r
+        * \r
+        * @param name\r
+        * @return list of strings\r
+        */\r
+       public List<Integer> getIntegers(String name) {\r
+               return getIntegers(name, " ");\r
+       }\r
+\r
+       /**\r
+        * Returns a list of integers from the specified key using the specified\r
+        * string separator.\r
+        * \r
+        * @param name\r
+        * @param separator\r
+        * @return list of integers\r
+        */\r
+       public List<Integer> getIntegers(String name, String separator) {\r
+               List<Integer> ints = new ArrayList<Integer>();\r
+               Properties props = getSettings();\r
+               if (props.containsKey(name)) {\r
+                       String value = props.getProperty(name);\r
+                       List<String> strings = StringUtils.getStringsFromValue(value, separator);\r
+                       for (String str : strings) {\r
+                               try {\r
+                                       int i = Integer.parseInt(str);\r
+                                       ints.add(i);\r
+                               } catch (NumberFormatException e) {\r
+                               }\r
+                       }\r
+               }\r
+               return ints;\r
+       }\r
+       \r
        /**\r
         * Returns a map of strings from the specified key.\r
         * \r

diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
index 8e841c798ef9669184a0cf4e995a97afbd0ec8a2..61838ba20e94275408889e02378e04ce27610c43 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
@@ -109,7 +109,7 @@ public class ActivityPage extends RootPage {
                                ActivityPage.class);\r
 \r
                PageParameters currentParameters = getPageParameters();\r
-               int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 14);\r
+               int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);\r
                if (currentParameters != null && !currentParameters.containsKey("db")) {\r
                        currentParameters.put("db", daysBack);\r
                }\r

diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index bbe20f5bf029f5b8d57be72f2dc743c31ccedc7a..a279163c8160595f7f76f58dd56633b27d4d081e 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -27,6 +27,7 @@ import java.util.LinkedHashSet;
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
+import java.util.TreeSet;\r
 import java.util.concurrent.atomic.AtomicInteger;\r
 import java.util.regex.Pattern;\r
 \r
@@ -178,7 +179,7 @@ public abstract class RootPage extends BasePage {
 \r
                                // remove days back parameter if it is the default value\r
                                if (params.containsKey("db")\r
-                                               && params.getInt("db") == GitBlit.getInteger(Keys.web.activityDuration, 14)) {\r
+                                               && params.getInt("db") == GitBlit.getInteger(Keys.web.activityDuration, 7)) {\r
                                        params.remove("db");\r
                                }\r
                                return params;\r
@@ -295,12 +296,15 @@ public abstract class RootPage extends BasePage {
 \r
        protected List<DropDownMenuItem> getTimeFilterItems(PageParameters params) {\r
                // days back choices - additive parameters\r
-               int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 14);\r
+               int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);\r
                if (daysBack < 1) {\r
-                       daysBack = 14;\r
+                       daysBack = 7;\r
                }\r
                List<DropDownMenuItem> items = new ArrayList<DropDownMenuItem>();\r
-               Set<Integer> choicesSet = new HashSet<Integer>(Arrays.asList(daysBack, 14, 28, 60, 90, 180));\r
+               Set<Integer> choicesSet = new TreeSet<Integer>(GitBlit.getIntegers(Keys.web.activityDurationChoices));\r
+               if (choicesSet.isEmpty()) {\r
+                        choicesSet.addAll(Arrays.asList(7, 14, 28, 60, 90, 180));\r
+               }\r
                List<Integer> choices = new ArrayList<Integer>(choicesSet);\r
                Collections.sort(choices);\r
                String lastDaysPattern = getString("gb.lastNDays");\r