From ff4a7a48ed25a891368d8082218fb5904a7df1a3 Mon Sep 17 00:00:00 2001
From: Mrbytes <eguervos@msn.com>
Date: Tue, 18 Dec 2012 13:26:30 -0500
Subject: [PATCH] GitBlitWebApp_es.properties: Up-to-date. Some minor changes in syntax for better compression.
---
src/com/gitblit/wicket/pages/SummaryPage.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 39c7269..8df2ceb 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -45,12 +45,14 @@
import com.gitblit.models.Metric;
import com.gitblit.models.PathModel;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.BranchesPanel;
+import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.LogPanel;
import com.gitblit.wicket.panels.RepositoryUrlPanel;
import com.gitblit.wicket.panels.TagsPanel;
@@ -80,7 +82,17 @@
// repository description
add(new Label("repositoryDescription", getRepositoryModel().description));
- add(new Label("repositoryOwner", getRepositoryModel().owner));
+ String owner = getRepositoryModel().owner;
+ if (StringUtils.isEmpty(owner)) {
+ add(new Label("repositoryOwner").setVisible(false));
+ } else {
+ UserModel ownerModel = GitBlit.self().getUserModel(owner);
+ if (ownerModel != null) {
+ add(new LinkPanel("repositoryOwner", null, ownerModel.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(owner)));
+ } else {
+ add(new Label("repositoryOwner", owner));
+ }
+ }
add(WicketUtils.createTimestampLabel("repositoryLastChange",
JGitUtils.getLastChange(r), getTimeZone(), getTimeUtils()));
@@ -130,7 +142,7 @@
add(new Label("otherUrls", StringUtils.flattenStrings(repositoryUrls, "<br/>"))
.setEscapeModelStrings(false));
- add(new LogPanel("commitsPanel", repositoryName, getRepositoryModel().HEAD, r, numberCommits, 0));
+ add(new LogPanel("commitsPanel", repositoryName, getRepositoryModel().HEAD, r, numberCommits, 0, getRepositoryModel().showRemoteBranches));
add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs).hideIfEmpty());
add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs, false).hideIfEmpty());
--
Gitblit v1.9.1