From 2a8a74bedafdb56b7e7edcb42642dc1eb5e54fff Mon Sep 17 00:00:00 2001
From: saheba <mail@saheba.net>
Date: Mon, 25 Mar 2013 16:34:45 -0400
Subject: [PATCH] code cleanup
---
src/com/gitblit/wicket/pages/RepositoryPage.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index b67aaa6..a477b74 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -79,7 +79,7 @@
private final Map<String, PageRegistration> registeredPages;
private boolean showAdmin;
- private boolean isRepoAdministrator;
+ private boolean isOwner;
public RepositoryPage(PageParameters params) {
super(params);
@@ -183,10 +183,10 @@
} else {
showAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false);
}
- isRepoAdministrator = GitBlitWebSession.get().isLoggedIn()
- && (model.isRepoAdministrator(GitBlitWebSession.get()
+ isOwner = GitBlitWebSession.get().isLoggedIn()
+ && (model.isOwner(GitBlitWebSession.get()
.getUsername()));
- if (showAdmin || isRepoAdministrator) {
+ if (showAdmin || isOwner) {
pages.put("edit", new PageRegistration("gb.edit", EditRepositoryPage.class, params));
}
return pages;
@@ -244,6 +244,14 @@
SummaryPage.class, WicketUtils.newRepositoryParameter(model.originRepository)));
add(forkFrag);
}
+ }
+
+ // show sparkleshare folder icon
+ if (model.isSparkleshared()) {
+ add(WicketUtils.newImage("repositoryIcon", "folder_star_32x32.png",
+ getString("gb.isSparkleshared")));
+ } else {
+ add(WicketUtils.newClearPixel("repositoryIcon").setVisible(false));
}
if (getRepositoryModel().isBare) {
@@ -357,10 +365,6 @@
submodules.put(model.path, model);
}
}
- return submodules;
- }
-
- protected Map<String, SubmoduleModel> getSubmodules() {
return submodules;
}
@@ -540,7 +544,7 @@
}
public boolean isOwner() {
- return isRepoAdministrator;
+ return isOwner;
}
private class SearchForm extends SessionlessForm<Void> implements Serializable {
--
Gitblit v1.9.1