From 859deba551b5e6850fb6331084493a402cecce45 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 11:19:31 -0400
Subject: [PATCH] Integrate admin menu into user menu and add user menu extension
---
src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java | 59 +++++++++++++----------------------------------------------
1 files changed, 13 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
index f2b56e1..a0f8ac4 100644
--- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
@@ -16,8 +16,6 @@
package com.gitblit.wicket.panels;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import org.apache.wicket.Component;
@@ -30,21 +28,17 @@
import org.apache.wicket.markup.html.panel.Fragment;
import com.gitblit.Constants.AccessRestrictionType;
-import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.SyndicationServlet;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
+import com.gitblit.servlet.SyndicationServlet;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.pages.BasePage;
-import com.gitblit.wicket.pages.DocsPage;
import com.gitblit.wicket.pages.EditRepositoryPage;
import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.SummaryPage;
-import com.gitblit.wicket.pages.TicketsPage;
import com.gitblit.wicket.pages.TreePage;
public class ProjectRepositoryPanel extends BasePanel {
@@ -56,9 +50,8 @@
final Map<AccessRestrictionType, String> accessRestrictions) {
super(wicketId);
- final boolean showSwatch = GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);
- final boolean gitServlet = GitBlit.getBoolean(Keys.git.enableGitServlet, true);
- final boolean showSize = GitBlit.getBoolean(Keys.web.showRepositorySizes, true);
+ final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true);
+ final boolean showSize = app().settings().getBoolean(Keys.web.showRepositorySizes, true);
// repository swatch
Component swatch;
@@ -82,7 +75,7 @@
add(new Label("originRepository").setVisible(false));
} else {
Fragment forkFrag = new Fragment("originRepository", "originFragment", this);
- forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(entry.originRepository),
+ forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(entry.originRepository),
SummaryPage.class, WicketUtils.newRepositoryParameter(entry.originRepository)));
add(forkFrag);
}
@@ -93,8 +86,11 @@
add(WicketUtils.newClearPixel("sparkleshareIcon").setVisible(false));
}
- add(new BookmarkablePageLink<Void>("tickets", TicketsPage.class, pp).setVisible(entry.useTickets));
- add(new BookmarkablePageLink<Void>("docs", DocsPage.class, pp).setVisible(entry.useDocs));
+ if (entry.isMirror) {
+ add(WicketUtils.newImage("mirrorIcon", "mirror_16x16.png", localizer.getString("gb.isMirror", parent)));
+ } else {
+ add(WicketUtils.newClearPixel("mirrorIcon").setVisible(false));
+ }
if (entry.isFrozen) {
add(WicketUtils.newImage("frozenIcon", "cold_16x16.png", localizer.getString("gb.isFrozen", parent)));
@@ -107,36 +103,17 @@
} else {
add(WicketUtils.newClearPixel("federatedIcon").setVisible(false));
}
- switch (entry.accessRestriction) {
- case NONE:
- add(WicketUtils.newBlankImage("accessRestrictionIcon").setVisible(false));
- break;
- case PUSH:
- add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png",
- accessRestrictions.get(entry.accessRestriction)));
- break;
- case CLONE:
- add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png",
- accessRestrictions.get(entry.accessRestriction)));
- break;
- case VIEW:
- add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png",
- accessRestrictions.get(entry.accessRestriction)));
- break;
- default:
- add(WicketUtils.newBlankImage("accessRestrictionIcon"));
- }
if (ArrayUtils.isEmpty(entry.owners)) {
add(new Label("repositoryOwner").setVisible(false));
} else {
String owner = "";
for (String username : entry.owners) {
- UserModel ownerModel = GitBlit.self().getUserModel(username);
-
+ UserModel ownerModel = app().users().getUserModel(username);
+
if (ownerModel != null) {
owner = ownerModel.getDisplayName();
- }
+ }
}
if (entry.owners.size() > 1) {
owner += ", ...";
@@ -168,7 +145,7 @@
@Override
public void onClick() {
- if (GitBlit.self().deleteRepositoryModel(entry)) {
+ if (app().repositories().deleteRepositoryModel(entry)) {
// redirect to the owning page
if (entry.isPersonalRepository()) {
setResponsePage(getPage().getClass(), WicketUtils.newUsernameParameter(entry.projectPath.substring(1)));
@@ -215,15 +192,5 @@
}
add(new ExternalLink("syndication", SyndicationServlet.asLink("", entry.name, null, 0)));
-
- List<String> repositoryUrls = new ArrayList<String>();
- if (gitServlet) {
- // add the Gitblit repository url
- repositoryUrls.add(BasePage.getRepositoryUrl(entry));
- }
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(entry.name, user == null ? "" : user.username));
-
- String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.remove(0);
- add(new RepositoryUrlPanel("repositoryCloneUrl", primaryUrl));
}
}
--
Gitblit v1.9.1