From 07eb0963cae3a403f8774f65afa20c940ce7124f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jun 2014 08:57:41 -0400
Subject: [PATCH] Merged #103 "flotr2 throws exception on small dashboards"

---
 src/main/java/com/gitblit/wicket/pages/RootPage.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index 98a8cb3..5ccc3a4 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -252,7 +252,7 @@
 			// Set Cookie
 			if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {
 				WebResponse response = (WebResponse) getRequestCycle().getResponse();
-				app().session().setCookie(response, user);
+				app().authentication().setCookie(response.getHttpServletResponse(), user);
 			}
 
 			if (!session.continueRequest()) {
@@ -536,7 +536,7 @@
 					String username = RootPage.this.username.getObject();
 					char[] password = RootPage.this.password.getObject().toCharArray();
 
-					UserModel user = app().session().authenticate(username, password);
+					UserModel user = app().authentication().authenticate(username, password);
 					if (user == null) {
 						error(getString("gb.invalidUsernameOrPassword"));
 					} else if (user.username.equals(Constants.FEDERATION_USER)) {
@@ -572,12 +572,11 @@
 
 			GitBlitWebSession session = GitBlitWebSession.get();
 			UserModel user = session.getUser();
-			boolean editCredentials = app().users().supportsCredentialChanges(user);
+			boolean editCredentials = app().authentication().supportsCredentialChanges(user);
 			boolean standardLogin = session.authenticationType.isStandard();
 
 			if (app().settings().getBoolean(Keys.web.allowGravatar, true)) {
-				add(new GravatarImage("username", user.getDisplayName(),
-						user.emailAddress, "navbarGravatar", 20, false, false));
+				add(new GravatarImage("username", user, "navbarGravatar", 20, false));
 			} else {
 				add(new Label("username", user.getDisplayName()));
 			}

--
Gitblit v1.9.1