From ebddb8e4afb55df915c0a2f5ef9dc5bfcbca8c5f Mon Sep 17 00:00:00 2001 From: Lloyd Wheeler Date: Mon, 17 Dec 2018 06:54:00 -0800 Subject: [PATCH] Should update disabled flag when updating --- .../dss/ipa/services/jpa/JpaSectionGroupCostService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java index 43da44314..f8e02b67e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java @@ -61,6 +61,7 @@ public SectionGroupCost createOrUpdateFrom(SectionGroupCost originalSectionGroup sectionGroupCost.setReason(originalSectionGroupCost.getReason()); sectionGroupCost.setSectionCount(originalSectionGroupCost.getSectionCount()); sectionGroupCost.setCost(originalSectionGroupCost.getCost()); + sectionGroupCost.setDisabled(originalSectionGroupCost.isDisabled()); return this.sectionGroupCostRepository.save(sectionGroupCost); } @@ -139,7 +140,11 @@ public SectionGroupCost update(SectionGroupCost sectionGroupCostDTO) { originalSectionGroupCost.setInstructor(instructorRepository.findById(sectionGroupCostDTO.getInstructorIdentification())); originalSectionGroupCost.setOriginalInstructor(instructorRepository.findById(sectionGroupCostDTO.getOriginalInstructorIdentification())); - originalSectionGroupCost.setInstructorType(instructorTypeRepository.findById(sectionGroupCostDTO.getInstructorType().getId())); + + if (sectionGroupCostDTO.getInstructorType() != null) { + originalSectionGroupCost.setInstructorType(instructorTypeRepository.findById(sectionGroupCostDTO.getInstructorType().getId())); + } + return this.sectionGroupCostRepository.save(originalSectionGroupCost); }