Fixed upgrade bug in user service (issue 41)

James Moger

2012-01-13 8051a29d8b3826772e5be1851eb72cd52ab5080c

 src/com/gitblit/wicket/pages/ActivityPage.java

@@ -35,6 +35,7 @@
import com.gitblit.models.Metric;

import com.gitblit.models.RepositoryModel;

import com.gitblit.utils.ActivityUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.PageRegistration;

import com.gitblit.wicket.PageRegistration.DropDownMenuItem;

import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;

@@ -109,16 +110,13 @@


      PageParameters currentParameters = getPageParameters();

      int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 14);

      if (currentParameters.containsKey("db")) {

         daysBack = currentParameters.getInt("db");

      }

      if (daysBack < 1) {

         daysBack = 14;

      if (currentParameters != null && !currentParameters.containsKey("db")) {

         currentParameters.put("db", daysBack);

      }



      // preserve time filter options on repository choices

      filters.menuItems.addAll(getRepositoryFilterItems(new PageParameters("db=" + daysBack)));

				
      filters.menuItems.addAll(getRepositoryFilterItems(currentParameters));



      // preserve repository filter options on time choices

      filters.menuItems.addAll(getTimeFilterItems(currentParameters));



@@ -155,7 +153,7 @@


         // aggregate repository metrics

         for (Map.Entry<String, Metric> entry : activity.getRepositoryMetrics().entrySet()) {

            String repository = entry.getKey();

            String repository = StringUtils.stripDotGit(entry.getKey());

            if (!repositoryMetrics.containsKey(repository)) {

               repositoryMetrics.put(repository, new Metric(repository));

            }