From cc3e873c09b1a91ffe232ba365e5933eb6829209 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 20 Jun 2013 08:35:53 -0400
Subject: [PATCH] Fixed dashboard owned repo list and the activity titles
---
src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java
index f6f9685..69dadbd 100644
--- a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java
@@ -130,14 +130,26 @@
Collections.sort(starred, lastUpdateSort);
Collections.sort(active, lastUpdateSort);
+ String activityTitle;
Set<RepositoryModel> feed = new HashSet<RepositoryModel>();
feed.addAll(starred);
feed.addAll(owned);
if (feed.isEmpty()) {
+ // no starred or owned, go with recent activity
+ activityTitle = getString("gb.recentActivity");
feed.addAll(active);
+ } else if (starred.isEmpty()){
+ // no starred, owned repos feed
+ activityTitle = getString("gb.owned");
+ } else if (owned.isEmpty()){
+ // no owned, starred repos feed
+ activityTitle = getString("gb.starred");
+ } else {
+ // starred and owned repositories
+ activityTitle = getString("gb.starredAndOwned");
}
- addActivity(user, feed, starred.size() > 0 || owned.size() > 0, daysBack);
+ addActivity(user, feed, activityTitle, daysBack);
Fragment repositoryTabs;
if (UserModel.ANONYMOUS.equals(user)) {
@@ -174,7 +186,7 @@
if (ArrayUtils.isEmpty(owned)) {
repositoryTabs.add(new Label("owned").setVisible(false));
} else {
- FilterableRepositoryList repoList = new FilterableRepositoryList("owned", starred);
+ FilterableRepositoryList repoList = new FilterableRepositoryList("owned", owned);
repoList.setTitle(getString("gb.myRepositories"), "icon-user");
repoList.setAllowCreate(user.canCreate() || user.canAdmin());
repositoryTabs.add(repoList);
--
Gitblit v1.9.1