jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor: when creating a job scoped document template default to all job types

Browse Source
This commit is contained in:
Gary Sharp
2022-12-15 15:00:31 +11:00
parent 2bd9238090
commit 584bc07824
3 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Models/UI/Config/DocumentTemplate/ConfigDocumentTemplateCreateModel.cs
+2 -2
View File
@@ -14,7 +14,7 @@ namespace Disco.Models.UI.Config.DocumentTemplate
List<string> Scopes { get; }
List<Repository.JobType> GetJobTypes { get; }
List<Repository.JobSubType> GetJobSubTypes { get; }
List<Repository.JobType> GetJobTypes();
List<Repository.JobSubType> GetJobSubTypes();
}
}
Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
+2 -6
View File
@@ -152,13 +152,9 @@ namespace Disco.Web.Areas.Config.Controllers
Database.DocumentTemplates.Add(model.DocumentTemplate);
if (model.DocumentTemplate.Scope == Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Job)
if (model.DocumentTemplate.Scope == DocumentTemplate.DocumentTemplateScopes.Job)
{
var jobSubTypes = new List<Disco.Models.Repository.JobSubType>();
jobSubTypes.AddRange(model.GetJobSubTypes);
model.DocumentTemplate.JobSubTypes = jobSubTypes;
//foreach (var jobSubType in model.GetJobSubTypes)
// model.AttachmentType.JobSubTypes.Add(jobSubType);
model.DocumentTemplate.JobSubTypes = model.GetJobSubTypes();
}
Database.SaveChanges();
Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
+13 -20
View File
@@ -30,29 +30,22 @@ namespace Disco.Web.Areas.Config.Models.DocumentTemplate
}
}
public List<Disco.Models.Repository.JobType> GetJobTypes
public List<Disco.Models.Repository.JobType> GetJobTypes()
{
get
{
if (Types != null)
{
var types = this.Types;
return this.JobTypes.Where(m => types.Contains(m.Id)).ToList();
}
return null;
}
var types = Types;
if (types != null && types.Count > 0)
return JobTypes.Where(m => types.Contains(m.Id)).ToList();
else
return new List<Disco.Models.Repository.JobType>(JobTypes);
}
public List<Disco.Models.Repository.JobSubType> GetJobSubTypes
public List<Disco.Models.Repository.JobSubType> GetJobSubTypes()
{
get
{
if (SubTypes != null)
{
var subTypes = this.SubTypes;
return this.JobSubTypes.Where(m => subTypes.Contains(String.Format("{0}_{1}", m.JobTypeId, m.Id))).ToList();
}
return null;
}
var subTypes = SubTypes;
if (subTypes != null && subTypes.Count > 0)
return JobSubTypes.Where(m => subTypes.Contains($"{m.JobTypeId}_{m.Id}")).ToList();
else
return new List<Disco.Models.Repository.JobSubType>(JobSubTypes);
}
public void UpdateModel(DiscoDataContext Database)