Make activity page respect short commit id setting and lower default from 8...

James Moger

2012-11-27 e627cfcaa9c567849cf11759260803ae380a034e

Make activity page respect short commit id setting and lower default from 8 to 6

 distrib/gitblit.properties

@@ -494,7 +494,7 @@
# Controls the length of shortened commit hash ids

#

# SINCE 1.2.0

web.shortCommitIdLength = 8

web.shortCommitIdLength = 6



# Use Clippy (Flash solution) to provide a copy-to-clipboard button.

# If false, a button with a more primitive JavaScript-based prompt box will


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

@@ -425,7 +425,7 @@
    }



    protected String getShortObjectId(String objectId) {

        return objectId.substring(0, GitBlit.getInteger(Keys.web.shortCommitIdLength, 8));

        return objectId.substring(0, GitBlit.getInteger(Keys.web.shortCommitIdLength, 6));

    }



    protected void addRefs(Repository r, RevCommit c) {


 src/com/gitblit/wicket/panels/ActivityPanel.java

@@ -24,6 +24,8 @@
import org.apache.wicket.markup.repeater.data.ListDataProvider;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.Activity;

import com.gitblit.models.Activity.RepositoryCommit;

import com.gitblit.utils.StringUtils;

@@ -50,6 +52,7 @@


        Collections.sort(recentActivity);

        

        final int shortHashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);

        DataView<Activity> activityView = new DataView<Activity>("activity",

                new ListDataProvider<Activity>(recentActivity)) {

            private static final long serialVersionUID = 1L;

@@ -105,7 +108,7 @@
                        commitItem.add(branchLink);



                        LinkPanel commitid = new LinkPanel("commitid", "list subject",

                                commit.getShortName(), CommitPage.class,

                                commit.getName().substring(0,  shortHashLen), CommitPage.class,

                                WicketUtils.newObjectParameter(commit.repository, commit.getName()), true);

                        commitItem.add(commitid);