From dfb88962fdbd29f59abe92178bb042738d57c3e1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 May 2011 22:07:18 -0400
Subject: [PATCH] Add user. Implemented repository view and git access restrictions.
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 111084c..9f3aa2a 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -33,6 +33,7 @@
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.RepositoryModel;
+import com.gitblit.wicket.models.User;
public class RepositoriesPage extends BasePage {
@@ -50,7 +51,8 @@
Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));
- adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("editUsers", RepositoriesPage.class));
add(adminLinks.setVisible(showAdmin));
// display an error message cached from a redirect
@@ -59,7 +61,7 @@
error(cachedMessage);
System.out.println("displayed message");
}
-
+
// Load the markdown welcome message
String messageSource = GitBlit.self().settings().getString(Keys.web.repositoriesMessage, "gitblit");
String message = "";
@@ -97,7 +99,8 @@
}
add(repositoriesMessage);
- List<RepositoryModel> rows = GitBlit.self().getRepositoryModels();
+ User user = GitBlitWebSession.get().getUser();
+ List<RepositoryModel> rows = GitBlit.self().getRepositoryModels(user);
DataProvider dp = new DataProvider(rows);
DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("repository", dp) {
private static final long serialVersionUID = 1L;
@@ -113,27 +116,38 @@
} else {
// New repository
item.add(new Label("repositoryName", entry.name + "<span class='empty'>(empty)</span>").setEscapeModelStrings(false));
- item.add(new Label("repositoryDescription", entry.description));
+ item.add(new Label("repositoryDescription", entry.description));
}
-
+
if (entry.useTickets) {
item.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png", getString("gb.tickets")));
} else {
- item.add(WicketUtils.newClearPixel("ticketsIcon"));
+ item.add(WicketUtils.newBlankImage("ticketsIcon"));
}
-
+
if (entry.useDocs) {
item.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs")));
} else {
- item.add(WicketUtils.newClearPixel("docsIcon"));
+ item.add(WicketUtils.newBlankImage("docsIcon"));
}
-
- if (entry.useRestrictedAccess) {
- item.add(WicketUtils.newImage("restrictedAccessIcon", "lock_16x16.png", getString("gb.restrictedAccess")));
- } else {
- item.add(WicketUtils.newClearPixel("restrictedAccessIcon"));
+
+ switch (entry.accessRestriction) {
+ case NONE:
+ item.add(WicketUtils.newBlankImage("restrictedAccessIcon"));
+ break;
+ case PUSH:
+ item.add(WicketUtils.newImage("restrictedAccessIcon", "lock_go_16x16.png", getString("gb.pushRestricted")));
+ break;
+ case CLONE:
+ item.add(WicketUtils.newImage("restrictedAccessIcon", "lock_pull_16x16.png", getString("gb.cloneRestricted")));
+ break;
+ case VIEW:
+ item.add(WicketUtils.newImage("restrictedAccessIcon", "shield_16x16.png", getString("gb.viewRestricted")));
+ break;
+ default:
+ item.add(WicketUtils.newBlankImage("restrictedAccessIcon"));
}
-
+
item.add(new Label("repositoryOwner", entry.owner));
String lastChange = TimeUtils.timeAgo(entry.lastChange);
--
Gitblit v1.9.1