Fixed missing clone url on the empty repository page

diff --git a/releases.moxie b/releases.moxie
index 49149a80108af6047de22e4721cbae6e62bc341a..0bf15781c673360d4df510022db64968554dc7af 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -14,12 +14,15 @@ r18: {
     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 @@ r18: {
        - James Moger
        - Stardrad Yin
        - Chad Horohoe
+       - Eduardo Guervós Narvaez
+       - Dongsu, KIM
 }
 
 #
@@ -264,8 +269,8 @@ r16: {
     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 97fac73ce262c90dc1488ed06201a3c70a39fbab..41f109a0b3a0f57fa45f82a6c92fda89c0b88fa5 100644 (file)
--- 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;\r
 \r
 import java.text.MessageFormat;\r
+import java.util.List;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
 \r
 import org.apache.wicket.PageParameters;\r
 import org.apache.wicket.markup.html.basic.Label;\r
+import org.apache.wicket.protocol.http.WebRequest;\r
 \r
 import com.gitblit.GitBlit;\r
 import com.gitblit.models.RepositoryModel;\r
+import com.gitblit.models.RepositoryUrl;\r
 import com.gitblit.models.UserModel;\r
 import com.gitblit.wicket.GitBlitWebSession;\r
 import com.gitblit.wicket.GitblitRedirectException;\r
@@ -53,13 +58,15 @@ public class EmptyRepositoryPage extends RootPage {
                        user = UserModel.ANONYMOUS;\r
                }\r
                \r
-               RepositoryUrlPanel urlPanel = new RepositoryUrlPanel("pushurl", false, user, repository);\r
-               String primaryUrl = urlPanel.getPrimaryUrl();\r
+               HttpServletRequest req = ((WebRequest) getRequest()).getHttpServletRequest();\r
+               List<RepositoryUrl> repositoryUrls = GitBlit.self().getRepositoryUrls(req, user, repository);\r
+               RepositoryUrl primaryUrl = repositoryUrls.size() == 0 ? null : repositoryUrls.get(0);\r
+               String url = primaryUrl != null ? primaryUrl.url : "";\r
                \r
                add(new Label("repository", repositoryName));\r
-               add(urlPanel);\r
-               add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", primaryUrl)));\r
-               add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", primaryUrl)));\r
+               add(new RepositoryUrlPanel("pushurl", false, user, repository));\r
+               add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", url)));\r
+               add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", url)));\r
        }\r
        \r
        @Override\r