Add setting to control inclusion of personal repositories in the main list

diff --git a/releases.moxie b/releases.moxie
index c7299a7e9107c4276fd0e94c14d32556c035a705..fc139b7788a5b1774570fe08f84143b4bb882b0e 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -29,6 +29,7 @@ r24: {
     - Overhaul the EmptyRepositoryPage (ticket-73)
     - Overhauled the edit repository page (ticket-76)
     - Process bugtraq links in the ticket description and comments (ticket-78)
+    - Exclude personal repositories from the repositories list, by default (issue-419, ticket-95)
     additions:
     - Add My Tickets page (issue-215, ticket-15)
     - Added CRUD functionality for Ticket Milestones (ticket-17)
@@ -55,8 +56,10 @@ r24: {
     - Marcus Hunger
     - Matthias Cullmann
     - Emmeran Seehuber
+    - Sascha Vogt
     settings:
     - { name: 'web.allowDeletingNonEmptyRepositories', defaultValue: 'true' }
+    - { name: 'web.includePersonalRepositories', defaultValue: 'false' }
     - { name: 'mail.starttls', defaultValue: 'false' }
     - { name: 'execution.defaultThreadPoolSize', defaultValue: '1' }
     - { name: 'git.gitignoreFolder', defaultValue: '${baseFolder}/gitignore' }

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index d5623cd51bae2e05b91674821de5d67dfa452796..65fe41e5b3eec2f2947eea3f06598071c0a59698 100644 (file)
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -782,6 +782,11 @@ web.allowCookieAuthentication = true
 # SINCE 1.6.0\r
 web.allowDeletingNonEmptyRepositories = true\r
 \r
+# Setting to include personal repositories in the main repositories list.\r
+#\r
+# SINCE 1.6.0\r
+web.includePersonalRepositories = false\r
+\r
 # Config file for storing project metadata\r
 #\r
 # SINCE 1.2.0\r

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
index a0b15a8349cccd0617ce474c8dd8b4a7aa6a210f..660b4ed1a18764d25cc3dffe4d5631d31e8e9c74 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;\r
 import java.text.MessageFormat;\r
 import java.util.ArrayList;\r
+import java.util.Iterator;\r
 import java.util.List;\r
 \r
 import org.apache.wicket.Component;\r
@@ -30,8 +31,8 @@ import org.eclipse.jgit.lib.Constants;
 \r
 import com.gitblit.Keys;\r
 import com.gitblit.models.Menu.ParameterMenuItem;\r
-import com.gitblit.models.NavLink.DropDownPageMenuNavLink;\r
 import com.gitblit.models.NavLink;\r
+import com.gitblit.models.NavLink.DropDownPageMenuNavLink;\r
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.utils.MarkdownUtils;\r
 import com.gitblit.utils.StringUtils;\r
@@ -79,7 +80,17 @@ public class RepositoriesPage extends RootPage {
                                .setEscapeModelStrings(false).setVisible(message.length() > 0);\r
                add(repositoriesMessage);\r
 \r
+               // conditionally include personal repositories in this page\r
                List<RepositoryModel> repositories = getRepositories(params);\r
+               if (!app().settings().getBoolean(Keys.web.includePersonalRepositories, true)) {\r
+                       Iterator<RepositoryModel> itr = repositories.iterator();\r
+                       while (itr.hasNext()) {\r
+                               RepositoryModel rm = itr.next();\r
+                               if (rm.isPersonalRepository()) {\r
+                                       itr.remove();\r
+                               }\r
+                       }\r
+               }\r
 \r
                RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", showAdmin,\r
                                true, repositories, true, getAccessRestrictions());\r