Eliminate Gravatar profile linking and improve api

James Moger

2014-03-03 94e12c168f5eec300fd23d0de25c7dc93a96c429

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

@@ -29,7 +29,6 @@
import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.panel.Fragment;



import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.Activity;

import com.gitblit.models.Metric;

@@ -66,14 +65,19 @@
      // parameters

      int daysBack = WicketUtils.getDaysBack(params);

      if (daysBack < 1) {

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

         daysBack = app().settings().getInteger(Keys.web.activityDuration, 7);

      }

      String objectId = WicketUtils.getObject(params);



      // determine repositories to view and retrieve the activity

      List<RepositoryModel> models = getRepositories(params);

      List<Activity> recentActivity = ActivityUtils.getRecentActivity(models,

            daysBack, objectId, getTimeZone());

      List<Activity> recentActivity = ActivityUtils.getRecentActivity(

            app().settings(),

            app().repositories(),

            models,

            daysBack,

            objectId,

            getTimeZone());



      String headerPattern;

      if (daysBack == 1) {

@@ -96,6 +100,7 @@
         // no activity, skip graphs and activity panel

         add(new Label("subheader", MessageFormat.format(headerPattern,

               daysBack)));

         add(new Label("chartsPanel").setVisible(false));

         add(new Label("activityPanel"));

      } else {

         // calculate total commits and total authors

@@ -112,7 +117,7 @@
               daysBack, totalCommits, totalAuthors)));



         // create the activity charts

         if (GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) {

         if (app().settings().getBoolean(Keys.web.generateActivityGraph, true)) {

            GoogleCharts charts = createCharts(recentActivity);

            add(new HeaderContributor(charts));

            add(new Fragment("chartsPanel", "chartsFragment", this));

@@ -136,7 +141,7 @@
            ActivityPage.class);



      PageParameters currentParameters = getPageParameters();

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

      int daysBack = app().settings().getInteger(Keys.web.activityDuration, 7);

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

         currentParameters.put("db", daysBack);

      }