diff options
| author | James Moger <james.moger@gitblit.com> | 2013-06-20 08:35:53 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-06-20 08:35:53 -0400 |
| commit | cc3e873c09b1a91ffe232ba365e5933eb6829209 (patch) | |
| tree | 2692b847a68442a0581ad30e506148896c85798a /src/main/java | |
| parent | 724da52635fbcc7c80cd0b7932f8b0d1cff6cb73 (diff) | |
| download | gitblit-cc3e873c09b1a91ffe232ba365e5933eb6829209.tar.gz gitblit-cc3e873c09b1a91ffe232ba365e5933eb6829209.zip | |
Fixed dashboard owned repo list and the activity titles
Diffstat (limited to 'src/main/java')
3 files changed, 17 insertions, 6 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java index 3c2828b7..64d52554 100644 --- a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java +++ b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java @@ -74,7 +74,7 @@ public abstract class DashboardPage extends RootPage { return true;
}
- protected void addActivity(UserModel user, Collection<RepositoryModel> repositories, boolean isStarred, int daysBack) {
+ protected void addActivity(UserModel user, Collection<RepositoryModel> repositories, String feedTitle, int daysBack) {
Calendar c = Calendar.getInstance();
c.add(Calendar.DATE, -1*daysBack);
Date minimumDate = c.getTime();
@@ -91,7 +91,7 @@ public abstract class DashboardPage extends RootPage { Fragment activityFragment = new Fragment("activity", "activityFragment", this);
add(activityFragment);
- activityFragment.add(new Label("feedTitle", getString( isStarred ? "gb.starredAndOwned" : "gb.recentActivity")));
+ activityFragment.add(new Label("feedTitle", feedTitle));
if (digests.size() == 0) {
// quiet or no starred repositories
if (repositories.size() == 0) {
diff --git a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java index f6f96853..69dadbd0 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 @@ public class MyDashboardPage extends DashboardPage { 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 @@ public class MyDashboardPage extends DashboardPage { 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);
diff --git a/src/main/java/com/gitblit/wicket/pages/ProjectPage.java b/src/main/java/com/gitblit/wicket/pages/ProjectPage.java index bfc8493c..fbd1db02 100644 --- a/src/main/java/com/gitblit/wicket/pages/ProjectPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ProjectPage.java @@ -122,8 +122,7 @@ public class ProjectPage extends DashboardPage { }
});
-
- addActivity(user, repositories, false, daysBack);
+ addActivity(user, repositories, getString("gb.recentActivity"), daysBack);
if (repositories.isEmpty()) {
add(new Label("repositoryList").setVisible(false));
|