Fix MigrateTickets failure for view-restricted repositories

diff --git a/src/main/java/com/gitblit/MigrateTickets.java b/src/main/java/com/gitblit/MigrateTickets.java
index 94284ee2d27f566d4dfb42f3fbe12696ae3aa8fb..b08228efac1b9ed588f56aa1a146761514f3dcd0 100644 (file)
--- a/src/main/java/com/gitblit/MigrateTickets.java
+++ b/src/main/java/com/gitblit/MigrateTickets.java
@@ -170,7 +170,7 @@ public class MigrateTickets {
                long start = System.nanoTime();
                long totalTickets = 0;
                long totalChanges = 0;
-               for (RepositoryModel repository : repositoryManager.getRepositoryModels(null)) {
+               for (RepositoryModel repository : repositoryManager.getRepositoryModels()) {
                        Set<Long> ids = inputService.getIds(repository);
                        if (ids == null || ids.isEmpty()) {
                                // nothing to migrate

diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 2ed52d67d2e92135f204864ac7623181bc2de5dd..08853a669d71c093bb74e3c6453473665449f864 100644 (file)
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -79,11 +79,11 @@ import com.gitblit.tickets.ITicketService;
 import com.gitblit.transport.ssh.IPublicKeyManager;
 import com.gitblit.transport.ssh.SshKey;
 import com.gitblit.utils.ArrayUtils;
-import com.gitblit.utils.XssFilter;
 import com.gitblit.utils.HttpUtils;
 import com.gitblit.utils.JsonUtils;
 import com.gitblit.utils.ObjectCache;
 import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.XssFilter;
 import com.google.gson.Gson;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonSyntaxException;
@@ -981,6 +981,11 @@ public class GitblitManager implements IGitblit {
                return repositoryManager.getRepository(repositoryName, logError);
        }
 
+       @Override
+       public List<RepositoryModel> getRepositoryModels() {
+               return repositoryManager.getRepositoryModels();
+       }
+
        @Override
        public List<RepositoryModel> getRepositoryModels(UserModel user) {
                return repositoryManager.getRepositoryModels(user);

diff --git a/src/main/java/com/gitblit/manager/IRepositoryManager.java b/src/main/java/com/gitblit/manager/IRepositoryManager.java
index f5cf03fa10ec31a5f77b5c0bae025b5f849ba4a1..f37612d328bca466136b7618b01889244baa2801 100644 (file)
--- a/src/main/java/com/gitblit/manager/IRepositoryManager.java
+++ b/src/main/java/com/gitblit/manager/IRepositoryManager.java
@@ -194,6 +194,14 @@ public interface IRepositoryManager extends IManager {
         */
        Repository getRepository(String repositoryName, boolean logError);
 
+       /**
+        * Returns the list of all repository models.
+        *
+        * @return list of all repository models
+        * @since 1.6.1
+        */
+       List<RepositoryModel> getRepositoryModels();
+
        /**
         * Returns the list of repository models that are accessible to the user.
         *

diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java
index ac9ea156155430a128ed4f221b63bf3ec799e66f..99441309e21e4d10af4d0f468157a19b2015595d 100644 (file)
--- a/src/main/java/com/gitblit/manager/RepositoryManager.java
+++ b/src/main/java/com/gitblit/manager/RepositoryManager.java
@@ -624,6 +624,27 @@ public class RepositoryManager implements IRepositoryManager {
                return r;
        }
 
+       /**
+        * Returns the list of all repository models.
+        *
+        * @return list of all repository models
+        */
+       @Override
+       public List<RepositoryModel> getRepositoryModels() {
+               long methodStart = System.currentTimeMillis();
+               List<String> list = getRepositoryList();
+               List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
+               for (String repo : list) {
+                       RepositoryModel model = getRepositoryModel(repo);
+                       if (model != null) {
+                               repositories.add(model);
+                       }
+               }
+               long duration = System.currentTimeMillis() - methodStart;
+               logger.info(MessageFormat.format("{0} repository models loaded in {1} msecs", duration));
+               return repositories;
+       }
+
        /**
         * Returns the list of repository models that are accessible to the user.
         *