From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 311 +++++++++++++++++++--------------------------------
1 files changed, 118 insertions(+), 193 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index a7ec963..f679c76 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -1,244 +1,169 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket.pages;
import java.io.File;
import java.io.FileReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
+import java.text.MessageFormat;
import java.util.List;
+import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-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.panel.Fragment;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.resource.ContextRelativeResource;
-import org.tautua.markdownpapers.Markdown;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
-import com.gitblit.utils.TimeUtils;
-import com.gitblit.wicket.BasePage;
import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.LinkPanel;
+import com.gitblit.wicket.PageRegistration;
+import com.gitblit.wicket.PageRegistration.DropDownMenuItem;
+import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.models.RepositoryModel;
+import com.gitblit.wicket.panels.RepositoriesPanel;
-public class RepositoriesPage extends BasePage {
+public class RepositoriesPage extends RootPage {
public RepositoriesPage() {
super();
- setupPage("", "");
+ setup(null);
+ }
- final boolean showAdmin;
- if (GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
- boolean allowAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
- showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
- } else {
- showAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);
+ public RepositoriesPage(PageParameters params) {
+ super(params);
+ setup(params);
+ }
+
+ @Override
+ protected boolean reusePageParameters() {
+ return true;
+ }
+
+ private void setup(PageParameters params) {
+ setupPage("", "");
+ // check to see if we should display a login message
+ boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true);
+ if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) {
+ String messageSource = GitBlit.getString(Keys.web.loginMessage, "gitblit");
+ String message = readMarkdown(messageSource, "login.mkd");
+ Component repositoriesMessage = new Label("repositoriesMessage", message);
+ add(repositoriesMessage.setEscapeModelStrings(false));
+ add(new Label("repositoriesPanel"));
+ return;
}
- Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
- adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));
- adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));
- add(adminLinks.setVisible(showAdmin));
-
// Load the markdown welcome message
- String messageSource = GitBlit.self().settings().getString(Keys.web.repositoriesMessage, "gitblit");
+ String messageSource = GitBlit.getString(Keys.web.repositoriesMessage, "gitblit");
+ String message = readMarkdown(messageSource, "welcome.mkd");
+ Component repositoriesMessage = new Label("repositoriesMessage", message)
+ .setEscapeModelStrings(false).setVisible(message.length() > 0);
+ add(repositoriesMessage);
+
+ List<RepositoryModel> repositories = getRepositories(params);
+
+ RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", showAdmin,
+ repositories, true, getAccessRestrictions());
+ // push the panel down if we are hiding the admin controls and the
+ // welcome message
+ if (!showAdmin && !repositoriesMessage.isVisible()) {
+ WicketUtils.setCssStyle(repositoriesPanel, "padding-top:5px;");
+ }
+ add(repositoriesPanel);
+ }
+
+ @Override
+ protected void addDropDownMenus(List<PageRegistration> pages) {
+ PageParameters params = getPageParameters();
+
+ DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters",
+ RepositoriesPage.class);
+ // preserve time filter option on repository choices
+ menu.menuItems.addAll(getRepositoryFilterItems(params));
+
+ // preserve repository filter option on time choices
+ menu.menuItems.addAll(getTimeFilterItems(params));
+
+ if (menu.menuItems.size() > 0) {
+ // Reset Filter
+ menu.menuItems.add(new DropDownMenuItem(getString("gb.reset"), null, null));
+ }
+
+ pages.add(menu);
+ }
+
+ private String readMarkdown(String messageSource, String resource) {
String message = "";
if (messageSource.equalsIgnoreCase("gitblit")) {
- // Read default welcome message
- try {
- ContextRelativeResource res = WicketUtils.getResource("welcome.mkd");
- InputStream is = res.getResourceStream().getInputStream();
- InputStreamReader reader = new InputStreamReader(is);
- StringWriter writer = new StringWriter();
- Markdown markdown = new Markdown();
- markdown.transform(reader, writer);
- message = writer.toString().trim();
- reader.close();
- writer.close();
- } catch (Throwable t) {
- message = "Failed to read default welcome message!";
- error(message, t);
- }
+ // Read default message
+ message = readDefaultMarkdown(resource);
} else {
- // Read user-supplied welcome message
+ // Read user-supplied message
if (!StringUtils.isEmpty(messageSource)) {
File file = new File(messageSource);
if (file.exists()) {
try {
FileReader reader = new FileReader(file);
- StringWriter writer = new StringWriter();
- Markdown markdown = new Markdown();
- markdown.transform(reader, writer);
- message = writer.toString().trim();
- reader.close();
- writer.close();
+ message = MarkdownUtils.transformMarkdown(reader);
} catch (Throwable t) {
message = "Failed to read " + file;
- error(message, t);
+ warn(message, t);
}
} else {
message = messageSource + " is not a valid file.";
}
}
}
- Component repositoriesMessage = new Label("repositoriesMessage", message).setEscapeModelStrings(false);
- if (!showAdmin) {
- WicketUtils.setCssStyle(repositoriesMessage, "padding-top:10px");
- }
- add(repositoriesMessage);
-
- List<RepositoryModel> rows = GitBlit.self().getRepositories();
- DataProvider dp = new DataProvider(rows);
- DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("repository", dp) {
- private static final long serialVersionUID = 1L;
- int counter = 0;
-
- public void populateItem(final Item<RepositoryModel> item) {
- final RepositoryModel entry = item.getModelObject();
- PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);
- item.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class, pp));
- item.add(new LinkPanel("repositoryDescription", "list", entry.description, SummaryPage.class, pp));
-
- if (entry.useTickets) {
- item.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png", getString("gb.tickets")));
- } else {
- item.add(WicketUtils.newClearPixel("ticketsIcon"));
- }
-
- if (entry.useDocs) {
- item.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs")));
- } else {
- item.add(WicketUtils.newClearPixel("docsIcon"));
- }
-
- if (entry.useRestrictedAccess) {
- item.add(WicketUtils.newImage("restrictedAccessIcon", "lock_16x16.png", getString("gb.restrictedAccess")));
- } else {
- item.add(WicketUtils.newClearPixel("restrictedAccessIcon"));
- }
-
- item.add(new Label("repositoryOwner", entry.owner));
-
- String lastChange = TimeUtils.timeAgo(entry.lastChange);
- Label lastChangeLabel = new Label("repositoryLastChange", lastChange);
- item.add(lastChangeLabel);
- WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));
-
- if (showAdmin) {
- Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryAdminLinks", this);
- repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)));
- repositoryLinks.add(new BookmarkablePageLink<Void>("renameRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
- repositoryLinks.add(new BookmarkablePageLink<Void>("deleteRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));
- item.add(repositoryLinks);
- } else {
- item.add(new Label("repositoryLinks"));
- }
- WicketUtils.setAlternatingBackground(item, counter);
- counter++;
- }
- };
- add(dataView);
-
- add(newSort("orderByRepository", SortBy.repository, dp, dataView));
- add(newSort("orderByDescription", SortBy.description, dp, dataView));
- add(newSort("orderByOwner", SortBy.owner, dp, dataView));
- add(newSort("orderByDate", SortBy.date, dp, dataView));
+ return message;
}
- protected enum SortBy {
- repository, description, owner, date;
+ private String readDefaultMarkdown(String file) {
+ String message;
+ try {
+ ContextRelativeResource res = WicketUtils.getResource(file);
+ InputStream is = res.getResourceStream().getInputStream();
+ InputStreamReader reader = new InputStreamReader(is);
+ message = MarkdownUtils.transformMarkdown(reader);
+ reader.close();
+ } catch (Throwable t) {
+ message = MessageFormat.format("Failed to read default message from {0}!", file);
+ error(message, t, false);
+ }
+ return message;
}
- protected OrderByBorder newSort(String wicketId, SortBy field, SortableDataProvider<?> dp, final DataView<?> dataView) {
- return new OrderByBorder(wicketId, field.name(), dp) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSortChanged() {
- dataView.setCurrentPage(0);
- }
- };
+ @Override
+ protected void onBeforeRender() {
+ if (GitBlit.isDebugMode()) {
+ // strip Wicket tags in debug mode for jQuery DOM traversal
+ Application.get().getMarkupSettings().setStripWicketTags(true);
+ }
+ super.onBeforeRender();
}
- private class DataProvider extends SortableDataProvider<RepositoryModel> {
- private static final long serialVersionUID = 1L;
- private List<RepositoryModel> list = null;
-
- protected DataProvider(List<RepositoryModel> list) {
- this.list = list;
- setSort(SortBy.date.name(), false);
+ @Override
+ protected void onAfterRender() {
+ if (GitBlit.isDebugMode()) {
+ // restore Wicket debug tags
+ Application.get().getMarkupSettings().setStripWicketTags(false);
}
-
- @Override
- public int size() {
- if (list == null)
- return 0;
- return list.size();
- }
-
- @Override
- public IModel<RepositoryModel> model(RepositoryModel header) {
- return new Model<RepositoryModel>(header);
- }
-
- @Override
- public Iterator<RepositoryModel> iterator(int first, int count) {
- SortParam sp = getSort();
- String prop = sp.getProperty();
- final boolean asc = sp.isAscending();
-
- if (prop == null || prop.equals(SortBy.date.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.lastChange.compareTo(o2.lastChange);
- return o2.lastChange.compareTo(o1.lastChange);
- }
- });
- } else if (prop.equals(SortBy.repository.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.name.compareTo(o2.name);
- return o2.name.compareTo(o1.name);
- }
- });
- } else if (prop.equals(SortBy.owner.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.owner.compareTo(o2.owner);
- return o2.owner.compareTo(o1.owner);
- }
- });
- } else if (prop.equals(SortBy.description.name())) {
- Collections.sort(list, new Comparator<RepositoryModel>() {
- @Override
- public int compare(RepositoryModel o1, RepositoryModel o2) {
- if (asc)
- return o1.description.compareTo(o2.description);
- return o2.description.compareTo(o1.description);
- }
- });
- }
- return list.subList(first, first + count).iterator();
- }
+ super.onAfterRender();
}
}
--
Gitblit v1.9.1