From d85bfb7c9bdfdffbe2c598e9a2f34b6d92cc99d1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:01:30 -0400
Subject: [PATCH] Improve ticket propose instructions based on primary repository url
---
src/main/java/com/gitblit/wicket/pages/RootSubPage.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RootSubPage.java b/src/main/java/com/gitblit/wicket/pages/RootSubPage.java
index 0be714e..62d07a7 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootSubPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootSubPage.java
@@ -24,7 +24,6 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
-import com.gitblit.GitBlit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ModelUtils;
@@ -32,9 +31,9 @@
/**
* RootSubPage is a non-topbar navigable RootPage. It also has a page header.
- *
+ *
* @author James Moger
- *
+ *
*/
public abstract class RootSubPage extends RootPage {
@@ -47,11 +46,11 @@
super(params);
createPageMapIfNeeded();
}
-
+
protected boolean requiresPageMap() {
return false;
}
-
+
protected void createPageMapIfNeeded() {
if (requiresPageMap()) {
// because Gitblit strives for page-statelessness
@@ -72,7 +71,7 @@
add(new Label("pageSubName", subName));
super.setupPage("", pageName);
}
-
+
protected List<String> getAccessRestrictedRepositoryList(boolean includeWildcards, UserModel user) {
// build list of access-restricted projects
String lastProject = null;
@@ -85,9 +84,9 @@
repos.add("[^" + ModelUtils.getUserRepoPrefix() + "].*");
}
}
-
- for (String repo : GitBlit.self().getRepositoryList()) {
- RepositoryModel repositoryModel = GitBlit.self().getRepositoryModel(repo);
+
+ for (String repo : app().repositories().getRepositoryList()) {
+ RepositoryModel repositoryModel = app().repositories().getRepositoryModel(repo);
if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)
&& repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED)) {
if (user != null &&
--
Gitblit v1.9.1