Fix various Multi-Domain bugs

2014-04-16 13:16:08 +10:00
parent 2281313966
commit d86280ae3e
15 changed files with 220 additions and 224 deletions
@@ -294,7 +294,7 @@ namespace Disco.Web.Areas.API.Controllers
                if (invalidSubjects.Count > 0)
                    throw new ArgumentException(string.Format("Subjects not found: {0}", string.Join(", ", invalidSubjects)), "Subjects");

-                var proposedSubjects = subjects.Select(s => s.Item2.SamAccountName).OrderBy(s => s).ToArray();
+                var proposedSubjects = subjects.Select(s => s.Item2.NetBiosId).OrderBy(s => s).ToArray();

                subjectIds = string.Join(",", proposedSubjects);

@@ -16,7 +16,7 @@ namespace Disco.Web.Areas.API.Models.JobQueue
        {
            return new Models.JobQueue.SubjectItem()
            {
-                Id = ADObject.SamAccountName,
+                Id = ADObject.NetBiosId,
                Name = ADObject.DisplayName,
                Type = ADObject is ActiveDirectoryGroup ? "group" : "user"
            };