Added short commit id column to log and history tables (issue 168)

James Moger

2012-11-27 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5

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

@@ -55,6 +55,7 @@
import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

@@ -130,13 +131,16 @@
   }   



   private void login() {

      Cookie[] cookies = ((WebRequest) getRequestCycle().getRequest()).getCookies();

      UserModel user = null;

      if (GitBlit.self().allowCookieAuthentication() && cookies != null && cookies.length > 0) {

         // Grab cookie from Browser Session

         user = GitBlit.self().authenticate(cookies);

      } else {

         user = GitBlit.self().authenticate(((WebRequest) getRequestCycle().getRequest()).getHttpServletRequest());

      // try to authenticate by servlet request

      UserModel user = GitBlit.self().authenticate(((WebRequest) getRequestCycle().getRequest()).getHttpServletRequest());



      if (user == null) {

         // try to authenticate by cookie

         Cookie[] cookies = ((WebRequest) getRequestCycle().getRequest()).getCookies();

         if (GitBlit.self().allowCookieAuthentication() && cookies != null && cookies.length > 0) {

            // Grab cookie from Browser Session

            user = GitBlit.self().authenticate(cookies);

         }

      }



      // Login the user

@@ -255,6 +259,21 @@
      }

      return map;

   }

	
   protected Map<AuthorizationControl, String> getAuthorizationControls() {

      Map<AuthorizationControl, String> map = new LinkedHashMap<AuthorizationControl, String>();

      for (AuthorizationControl type : AuthorizationControl.values()) {

         switch (type) {

         case AUTHENTICATED:

            map.put(type, getString("gb.allowAuthenticatedDescription"));

            break;

         case NAMED:

            map.put(type, getString("gb.allowNamedDescription"));

            break;

         }

      }

      return map;

   }



   protected TimeZone getTimeZone() {

      return GitBlit.getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get()