Changeset 17059 for stable/HeuristicLab.Services.Hive/3.3/DataTransfer

Timestamp:

07/04/19 14:28:13 (6 years ago)

Author:

mkommend

Message:

#2839: Merged 16117, 16122, 16173, 16184, 16185, 16186, 16187, 16202, 16203, 16204, 16205, 16208, 16211, 16209, 16211, 16219, 16257, 16247 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/DataTransfer/AssignedJobResource.cs (copied) (copied from trunk/HeuristicLab.Services.Hive/3.3/DataTransfer/AssignedJobResource.cs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/AssignedProjectResource.cs (copied) (copied from trunk/HeuristicLab.Services.Hive/3.3/DataTransfer/AssignedProjectResource.cs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/Job.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/DataTransfer/JobState.cs (copied) (copied from trunk/HeuristicLab.Services.Hive/3.3/DataTransfer/JobState.cs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/Project.cs (copied) (copied from trunk/HeuristicLab.Services.Hive/3.3/DataTransfer/Project.cs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/ProjectPermission.cs (copied) (copied from trunk/HeuristicLab.Services.Hive/3.3/DataTransfer/ProjectPermission.cs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/ResourcePermission.cs (deleted)

stable/HeuristicLab.Services.Hive/3.3/DataTransfer/Job.cs

@@ -32 +32 @@
     public DateTime DateCreated { get; set; }
     [DataMember]
-    public string ResourceNames { get; set; }
+    public Guid ProjectId { get; set; }
     [DataMember]
     public Permission Permission { get; set; } // the permission for the currently logged in user
     [DataMember]
     public string OwnerUsername { get; set; }
+    [DataMember]
+    public JobState State { get; set; }
 
     /* ==== some computed statistics ==== */