Strip folder name and .git from repo links in the project view

James Moger

2012-09-10 fabe060d3a435f116128851f828e35c2af5fde67

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

@@ -28,10 +28,16 @@
import org.apache.wicket.behavior.HeaderContributor;

import org.apache.wicket.markup.html.basic.Label;



import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.Activity;

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;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.charting.GoogleChart;

import com.gitblit.wicket.charting.GoogleCharts;

@@ -61,7 +67,8 @@


      // determine repositories to view and retrieve the activity

      List<RepositoryModel> models = getRepositories(params);

      List<Activity> recentActivity = ActivityUtils.getRecentActivity(models, daysBack, objectId);

      List<Activity> recentActivity = ActivityUtils.getRecentActivity(models, 
            daysBack, objectId, getTimeZone());



      if (recentActivity.size() == 0) {

         // no activity, skip graphs and activity panel

@@ -73,7 +80,7 @@
         int totalCommits = 0;

         Set<String> uniqueAuthors = new HashSet<String>();

         for (Activity activity : recentActivity) {

            totalCommits += activity.commits.size();

            totalCommits += activity.getCommitCount();

            uniqueAuthors.addAll(activity.getAuthorMetrics().keySet());

         }

         int totalAuthors = uniqueAuthors.size();

@@ -89,6 +96,35 @@
         // add activity panel

         add(new ActivityPanel("activityPanel", recentActivity));

      }

   }



   @Override

   protected boolean reusePageParameters() {

      return true;

   }



   @Override

   protected void addDropDownMenus(List<PageRegistration> pages) {

      DropDownMenuRegistration filters = new DropDownMenuRegistration("gb.filters",

            ActivityPage.class);



      PageParameters currentParameters = getPageParameters();

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

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

         currentParameters.put("db", daysBack);

      }



      // preserve time filter options on repository choices

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



      // preserve repository filter options on time choices

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



      if (filters.menuItems.size() > 0) {

         // Reset Filter

         filters.menuItems.add(new DropDownMenuItem(getString("gb.reset"), null, null));

      }

      pages.add(filters);

   }



   /**

@@ -117,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));

            }

@@ -138,8 +174,9 @@
      GoogleChart chart = new GoogleLineChart("chartDaily", getString("gb.dailyActivity"), "day",

            getString("gb.commits"));

      SimpleDateFormat df = new SimpleDateFormat("MMM dd");

      df.setTimeZone(getTimeZone());

      for (Activity metric : recentActivity) {

         chart.addValue(df.format(metric.startDate), metric.commits.size());

         chart.addValue(df.format(metric.startDate), metric.getCommitCount());

      }

      chart.setWidth(w);

      chart.setHeight(h);