From 34148fc36e5357525705d8ce1b4169fb8acf2103 Mon Sep 17 00:00:00 2001 From: Rafael Cavazin <rafaelcavazin@gmail.com> Date: Tue, 18 Dec 2012 16:40:18 -0500 Subject: [PATCH] Merged Brazilian Portuguese translation --- src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java index c66fa60..50f0d52 100644 --- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java +++ b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java @@ -134,8 +134,11 @@ } UserModel user = GitBlitWebSession.get().getUser(); + if (user == null) { + user = UserModel.ANONYMOUS; + } Fragment repositoryLinks; - boolean showOwner = user != null && user.username.equalsIgnoreCase(entry.owner); + boolean showOwner = entry.isOwner(user.username); // owner of personal repository gets admin powers boolean showAdmin = isAdmin || entry.isUsersPersonalRepository(user.username); @@ -152,8 +155,12 @@ @Override public void onClick() { if (GitBlit.self().deleteRepositoryModel(entry)) { - info(MessageFormat.format(getString("gb.repositoryDeleted"), entry)); - // TODO dp.remove(entry); + // redirect to the owning page + if (entry.isPersonalRepository()) { + setResponsePage(getPage().getClass(), WicketUtils.newUsernameParameter(entry.projectPath.substring(1))); + } else { + setResponsePage(getPage().getClass(), WicketUtils.newProjectParameter(entry.projectPath)); + } } else { error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), entry)); } -- Gitblit v1.9.1