SAK-41057: edu-services > external GB item 'release to students' sett…

…ing overwritten on update (sakaiproject#6358)
vishu77 · Dec 10, 2018 · e971347 · e971347
1 parent 21b1f65
commit e971347
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...ebook-service/hibernate/src/java/org/sakaiproject/tool/gradebook/GradebookAssignment.java b/...ebook-service/hibernate/src/java/org/sakaiproject/tool/gradebook/GradebookAssignment.java
@@ -88,7 +88,7 @@ public class GradebookAssignment extends GradableObject {
 	@Getter @Setter private String externalId;
 	@Getter @Setter private String externalAppName;
 	@Getter @Setter private String externalData;
-	@Setter private Boolean released;
+	@Setter @Getter private Boolean released;
 	@Getter @Setter private Category category;
 	@Getter @Setter private Double averageTotal;
 	@Setter private Boolean ungraded;

diff --git a/...src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java b/...src/java/org/sakaiproject/component/gradebook/GradebookExternalAssessmentServiceImpl.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.ConcurrentMap;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.criterion.Projections;
@@ -239,7 +240,7 @@ public Object doInHibernate(final Session session) throws HibernateException {
 				asn.setName(title);
 				asn.setDueDate(dueDate);
 				// support selective release
-				asn.setReleased(true);
+				asn.setReleased(BooleanUtils.isTrue(asn.getReleased()));
 				asn.setPointsPossible(Double.valueOf(points));
 				session.update(asn);
 				log.info("External assessment updated in gradebookUid={}, externalId={} by userUid={}", gradebookUid, externalId,
@@ -780,7 +781,7 @@ public void updateExternalAssessment(final String gradebookUid, final String ext
 			asn.setName(title);
 			asn.setDueDate(dueDate);
 			// support selective release
-			asn.setReleased(true);
+			asn.setReleased(BooleanUtils.isTrue(asn.getReleased()));
 			asn.setPointsPossible(points);
 			if (ungraded != null) {
 				asn.setUngraded(ungraded.booleanValue());