Changeset 13166


Ignore:
Timestamp:
11/16/15 09:30:20 (4 years ago)
Author:
ascheibe
Message:

#2503 merged r13142 into stable

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Services.Hive

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

    r13007 r13166  
    696696        return pm.UseTransaction(() => {
    697697          var resourcePermissions = resourcePermissionDao.GetAll();
    698           return slaveDao.GetAll()
     698          return slaveDao.GetAll().ToList()
    699699            .Where(x => isAdministrator
    700700              || x.OwnerUserId == null
     
    721721        return pm.UseTransaction(() => {
    722722          var resourcePermissions = resourcePermissionDao.GetAll();
    723           return slaveGroupDao.GetAll()
     723          return slaveGroupDao.GetAll().ToList()
    724724            .Where(x => isAdministrator
    725725              || x.OwnerUserId == null
Note: See TracChangeset for help on using the changeset viewer.