Fixed dashboard owned repo list and the activity titles

James Moger

2013-06-20 cc3e873c09b1a91ffe232ba365e5933eb6829209

Fixed dashboard owned repo list and the activity titles

 src/main/java/com/gitblit/wicket/pages/DashboardPage.java

@@ -74,7 +74,7 @@
        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 @@
        

        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) {


 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);


 src/main/java/com/gitblit/wicket/pages/ProjectPage.java

@@ -122,8 +122,7 @@
            }

        });



		
        addActivity(user, repositories, false, daysBack);

        addActivity(user, repositories, getString("gb.recentActivity"), daysBack);

        

        if (repositories.isEmpty()) {

            add(new Label("repositoryList").setVisible(false));