From 68ae0d32ea896155e5b611d10c1663b674c3a220 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 08:31:13 -0400
Subject: [PATCH] Merge branch 'ticket/84' into develop
---
src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java | 121 ----------------------------------------
1 files changed, 1 insertions(+), 120 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index 40cd77e..d8e23be 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -15,7 +15,6 @@
*/
package com.gitblit.wicket.panels;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -32,7 +31,6 @@
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -47,7 +45,6 @@
import com.gitblit.models.ProjectModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
-import com.gitblit.servlet.SyndicationServlet;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.StringUtils;
@@ -141,12 +138,11 @@
Collections.sort(subModels);
groupedModels.addAll(subModels);
}
- dp = new RepositoriesProvider(groupedModels);
+ dp = new ListDataProvider<RepositoryModel>(groupedModels);
} else {
dp = new SortableRepositoriesProvider(models);
}
- final String baseUrl = WicketUtils.getGitblitURL(getRequest());
final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true);
DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("row", dp) {
@@ -320,64 +316,6 @@
WicketUtils.setHtmlTooltip(lastChangeLabel, getString("gb.author") + ": " + entry.lastChangeAuthor);
}
- boolean showOwner = user != null && entry.isOwner(user.username);
- boolean myPersonalRepository = showOwner && entry.isUsersPersonalRepository(user.username);
- if (showAdmin || myPersonalRepository) {
- Fragment repositoryLinks = new Fragment("repositoryLinks",
- "repositoryAdminLinks", this);
- repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository",
- EditRepositoryPage.class, WicketUtils
- .newRepositoryParameter(entry.name)));
- Link<Void> deleteLink = new Link<Void>("deleteRepository") {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick() {
- // refresh the model
- RepositoryModel model = app().repositories().getRepositoryModel(entry.name);
- if (isDeleteAllowed(model) &&
- app().repositories().deleteRepositoryModel(model)) {
- if (dp instanceof SortableRepositoriesProvider) {
- info(MessageFormat.format(getString("gb.repositoryDeleted"), model));
- ((SortableRepositoriesProvider) dp).remove(model);
- } else {
- setResponsePage(getPage().getClass(), getPage().getPageParameters());
- }
- } else {
- error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), model));
- }
- }
-
- @Override
- public boolean isEnabled() {
- return isDeleteAllowed(entry);
- }
-
- private boolean isDeleteAllowed(
- final RepositoryModel model) {
- return app().settings().getBoolean(Keys.web.allowDeletingNonEmptyRepositories, true)
- || !model.hasCommits;
- }
- };
- if (deleteLink.isEnabled()) {
- deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(
- getString("gb.deleteRepository"), entry)));
- }
- repositoryLinks.add(deleteLink);
- row.add(repositoryLinks);
- } else if (showOwner) {
- Fragment repositoryLinks = new Fragment("repositoryLinks",
- "repositoryOwnerLinks", this);
- repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository",
- EditRepositoryPage.class, WicketUtils
- .newRepositoryParameter(entry.name)));
- row.add(repositoryLinks);
- } else {
- row.add(new Label("repositoryLinks"));
- }
- row.add(new ExternalLink("syndication", SyndicationServlet.asLink(baseUrl,
- entry.name, null, 0)).setVisible(linksActive));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
@@ -434,59 +372,6 @@
};
}
- private static class RepositoriesProvider extends ListDataProvider<RepositoryModel> {
-
- private static final long serialVersionUID = 1L;
-
- public RepositoriesProvider(List<RepositoryModel> list) {
- super(list);
- }
-
- @Override
- public List<RepositoryModel> getData() {
- return super.getData();
- }
-
- public void remove(RepositoryModel model) {
- int index = getData().indexOf(model);
- RepositoryModel groupModel = null;
- if (index == (getData().size() - 1)) {
- // last element
- if (index > 0) {
- // previous element is group header, then this is last
- // repository in group. remove group too.
- if (getData().get(index - 1) instanceof GroupRepositoryModel) {
- groupModel = getData().get(index - 1);
- }
- }
- } else if (index < (getData().size() - 1)) {
- // not last element. check next element for group match.
- if (getData().get(index - 1) instanceof GroupRepositoryModel
- && getData().get(index + 1) instanceof GroupRepositoryModel) {
- // repository is sandwiched by group headers so this
- // repository is the only element in the group. remove
- // group.
- groupModel = getData().get(index - 1);
- }
- }
-
- if (groupModel == null) {
- // Find the group and decrement the count
- for (int i = index; i >= 0; i--) {
- if (getData().get(i) instanceof GroupRepositoryModel) {
- ((GroupRepositoryModel) getData().get(i)).count--;
- break;
- }
- }
- } else {
- // Remove the group header
- getData().remove(groupModel);
- }
-
- getData().remove(model);
- }
- }
-
private static class SortableRepositoriesProvider extends SortableDataProvider<RepositoryModel> {
private static final long serialVersionUID = 1L;
@@ -496,10 +381,6 @@
protected SortableRepositoriesProvider(List<RepositoryModel> list) {
this.list = list;
setSort(SortBy.date.name(), false);
- }
-
- public void remove(RepositoryModel model) {
- list.remove(model);
}
@Override
--
Gitblit v1.9.1