From 0096569bfdb8eb3cd7483a0d40f42c99b5be93bb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 19 Jul 2013 11:13:41 -0400
Subject: [PATCH] Fixed missing clone url on the empty repository page
---
releases.moxie | 11 ++++++++---
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 17 ++++++++++++-----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 49149a8..0bf1578 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -14,12 +14,15 @@
fixes:
- Gitblit-as-viewer with no repository urls failed to display summary page (issue 269)
- Fixed missing model class dependencies in Gitblit Manager build
- - Fix for IE10 compatability mode
+ - Fix for IE10 compatibility mode
- Reset dashboard and activity commit cache on branch REWIND or DELETE
- Fixed bug with adding new local users with external authentication
+ - Fixed missing clone url on the empty repository page
changes:
- updated Chinese translation
- updated Dutch translation
+ - updated Spanish translation
+ - updated Korean translation
additions:
- Added optional browser-side page caching using Last-Modified and Cache-Control for the dashboard, activity, project, and several repository pages
dependencyChanges: ~
@@ -32,6 +35,8 @@
- James Moger
- Stardrad Yin
- Chad Horohoe
+ - Eduardo Guervós Narvaez
+ - Dongsu, KIM
}
#
@@ -264,8 +269,8 @@
contributors:
- James Moger
- github/mystygage
- - github/ds5apn
- - github/kwoot
+ - Dongsu, KIM
+ - Jeroen Baten
- github/inaiat
}
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index 97fac73..41f109a 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -16,12 +16,17 @@
package com.gitblit.wicket.pages;
import java.text.MessageFormat;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.protocol.http.WebRequest;
import com.gitblit.GitBlit;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.RepositoryUrl;
import com.gitblit.models.UserModel;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.GitblitRedirectException;
@@ -53,13 +58,15 @@
user = UserModel.ANONYMOUS;
}
- RepositoryUrlPanel urlPanel = new RepositoryUrlPanel("pushurl", false, user, repository);
- String primaryUrl = urlPanel.getPrimaryUrl();
+ HttpServletRequest req = ((WebRequest) getRequest()).getHttpServletRequest();
+ List<RepositoryUrl> repositoryUrls = GitBlit.self().getRepositoryUrls(req, user, repository);
+ RepositoryUrl primaryUrl = repositoryUrls.size() == 0 ? null : repositoryUrls.get(0);
+ String url = primaryUrl != null ? primaryUrl.url : "";
add(new Label("repository", repositoryName));
- add(urlPanel);
- add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", primaryUrl)));
- add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", primaryUrl)));
+ add(new RepositoryUrlPanel("pushurl", false, user, repository));
+ add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", url)));
+ add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", url)));
}
@Override
--
Gitblit v1.9.1