Changeset 13166

Timestamp:

11/16/15 09:30:20 (9 years ago)

Author:

ascheibe

Message:

#2503 merged r13142 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (2 diffs)

stable/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -696 +696 @@
         return pm.UseTransaction(() => {
           var resourcePermissions = resourcePermissionDao.GetAll();
-          return slaveDao.GetAll()
+          return slaveDao.GetAll().ToList()
             .Where(x => isAdministrator
               || x.OwnerUserId == null
@@ -721 +721 @@
         return pm.UseTransaction(() => {
           var resourcePermissions = resourcePermissionDao.GetAll();
-          return slaveGroupDao.GetAll()
+          return slaveGroupDao.GetAll().ToList()
             .Where(x => isAdministrator
               || x.OwnerUserId == null