Merge pull request #111 from atdt/master
Add setting to cap number of activity days to display
| | |
| | | - Added pptx extension for tree page icon lookup |
| | | - Fixed project links on dashboard page when web.mountParameters=false |
| | | changes: ~ |
| | | additions: ~ |
| | | additions: |
| | | - Add setting for maximum number of days of activity to that may be requested |
| | | dependencyChanges: ~ |
| | | contributors: |
| | | - github/guriguri |
| | | - Doug Ayers |
| | | - Ori Livneh |
| | | settings: |
| | | - { name: 'web.activityDurationMaximum', defaultValue: 30 } |
| | | } |
| | | |
| | | # |
| | |
| | | # SINCE 1.3.0
|
| | | web.activityDurationChoices = 1 3 7 14 21 28
|
| | |
|
| | | # Maximum number of days of activity that may be displayed on the activity page.
|
| | | #
|
| | | # SINCE 1.3.2
|
| | | web.activityDurationMaximum = 30
|
| | |
|
| | | # The number of days of commits to cache in memory for the dashboard, activity,
|
| | | # and project pages. A value of 0 will disable all caching and will parse commits
|
| | | # in each repository per-request. If the value > 0 these pages will try to fulfill
|
| | |
| | | String regex = WicketUtils.getRegEx(params);
|
| | | String team = WicketUtils.getTeam(params);
|
| | | int daysBack = params.getInt("db", 0);
|
| | | int maxDaysBack = GitBlit.getInteger(Keys.web.activityDurationMaximum, 30);
|
| | |
|
| | | List<ProjectModel> availableModels = getProjectModels();
|
| | | Set<ProjectModel> models = new HashSet<ProjectModel>();
|
| | |
| | |
|
| | | // time-filter the list
|
| | | if (daysBack > 0) {
|
| | | if (maxDaysBack > 0 && daysBack > maxDaysBack) {
|
| | | daysBack = maxDaysBack;
|
| | | }
|
| | | Calendar cal = Calendar.getInstance();
|
| | | cal.set(Calendar.HOUR_OF_DAY, 0);
|
| | | cal.set(Calendar.MINUTE, 0);
|
| | |
| | |
|
| | | // parameters
|
| | | int daysBack = params == null ? 0 : WicketUtils.getDaysBack(params);
|
| | | int maxDaysBack = GitBlit.getInteger(Keys.web.activityDurationMaximum, 30);
|
| | | if (daysBack < 1) {
|
| | | daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);
|
| | | }
|
| | | if (maxDaysBack > 0 && daysBack > maxDaysBack) {
|
| | | daysBack = maxDaysBack;
|
| | | }
|
| | | Calendar c = Calendar.getInstance();
|
| | | c.add(Calendar.DATE, -1*daysBack);
|
| | | Date minimumDate = c.getTime();
|
| | |
| | | protected List<DropDownMenuItem> getTimeFilterItems(PageParameters params) {
|
| | | // days back choices - additive parameters
|
| | | int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);
|
| | | int maxDaysBack = GitBlit.getInteger(Keys.web.activityDurationMaximum, 30);
|
| | | if (daysBack < 1) {
|
| | | daysBack = 7;
|
| | | }
|
| | | if (daysBack > maxDaysBack) {
|
| | | daysBack = maxDaysBack;
|
| | | }
|
| | | PageParameters clonedParams;
|
| | | if (params == null) {
|
| | |
| | | String regex = WicketUtils.getRegEx(params);
|
| | | String team = WicketUtils.getTeam(params);
|
| | | int daysBack = params.getInt("db", 0);
|
| | | int maxDaysBack = GitBlit.getInteger(Keys.web.activityDurationMaximum, 30);
|
| | |
|
| | | List<RepositoryModel> availableModels = getRepositoryModels();
|
| | | Set<RepositoryModel> models = new HashSet<RepositoryModel>();
|
| | |
| | |
|
| | | // time-filter the list
|
| | | if (daysBack > 0) {
|
| | | if (maxDaysBack > 0 && daysBack > maxDaysBack) {
|
| | | daysBack = maxDaysBack;
|
| | | }
|
| | | Calendar cal = Calendar.getInstance();
|
| | | cal.set(Calendar.HOUR_OF_DAY, 0);
|
| | | cal.set(Calendar.MINUTE, 0);
|