diff --git a/src/main/java/org/olat/core/configuration/PersistedProperties.java b/src/main/java/org/olat/core/configuration/PersistedProperties.java index 56f976905051f40f5afcab6f7776683aa70bc1c7..baf51868fd6a95980c0cdb289ad4769fe3547ed9 100644 --- a/src/main/java/org/olat/core/configuration/PersistedProperties.java +++ b/src/main/java/org/olat/core/configuration/PersistedProperties.java @@ -443,7 +443,8 @@ public class PersistedProperties extends LogDelegator implements Initializable, public void removeProperty(String propertyName, boolean saveConfiguration) { synchronized (configuredProperties) { // make read/write save in VM - configuredProperties.remove(propertyName); + Object removedProperty = configuredProperties.remove(propertyName); + propertiesDirty |= removedProperty != null; if (saveConfiguration) { savePropertiesAndFireChangedEvent(); } diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityListCourseTreeController.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityListCourseTreeController.java index 0f90f372c2c6fe76fced3f92db6210aa3dad6e54..65ad64d781b5f279d12b85c597fbd69a3fc8808d 100644 --- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityListCourseTreeController.java +++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityListCourseTreeController.java @@ -158,8 +158,8 @@ public class AssessmentIdentityListCourseTreeController extends BasicController OLATResourceable ores = OresHelper.createOLATResourceableInstance("Node", new Long(courseNode.getIdent())); WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl()); - if(courseNode instanceof AssessableCourseNode && ((AssessableCourseNode)courseNode).isAssessedBusinessGroups()) { - if(courseNode instanceof GTACourseNode) { + if(courseNode instanceof AssessableCourseNode) { + if(((AssessableCourseNode)courseNode).isAssessedBusinessGroups() && courseNode instanceof GTACourseNode) { CourseEnvironment courseEnv = CourseFactory.loadCourse(courseEntry).getCourseEnvironment(); List<BusinessGroup> coachedGroups; @@ -170,8 +170,11 @@ public class AssessmentIdentityListCourseTreeController extends BasicController } else { coachedGroups = assessmentCallback.getCoachedGroups(); } - currentCtrl = ((GTACourseNode)courseNode).getCoachedGroupListController(ureq, getWindowControl(), stackPanel, + currentCtrl = ((GTACourseNode)courseNode).getCoachedGroupListController(ureq, bwControl, stackPanel, coachCourseEnv, assessmentCallback.isAdmin(), coachedGroups); + } else { + currentCtrl = ((AssessableCourseNode)courseNode).getIdentityListController(ureq, bwControl, stackPanel, + courseEntry, businessGroup, coachCourseEnv, toolContainer, assessmentCallback); } } else { currentCtrl = new IdentityListCourseNodeController(ureq, bwControl, stackPanel, diff --git a/src/main/java/org/olat/repository/RepositoryManager.java b/src/main/java/org/olat/repository/RepositoryManager.java index 66ff441f538005dcb5eea1193453da59b68a9849..9497d85edad69ff33e76b63c776c16a65b8424a0 100644 --- a/src/main/java/org/olat/repository/RepositoryManager.java +++ b/src/main/java/org/olat/repository/RepositoryManager.java @@ -693,7 +693,7 @@ public class RepositoryManager { //fetch the values updatedRe.getStatistics().getLaunchCounter(); if(updatedRe.getLifecycle() != null) { - updatedRe.getLifecycle().getKey(); + updatedRe.getLifecycle().getCreationDate(); } dbInstance.commit(); @@ -710,7 +710,7 @@ public class RepositoryManager { RepositoryEntry updatedRe = dbInstance.getCurrentEntityManager().merge(reloadedRe); updatedRe.getStatistics().getLaunchCounter(); if(updatedRe.getLifecycle() != null) { - updatedRe.getLifecycle().getKey(); + updatedRe.getLifecycle().getCreationDate(); } dbInstance.commit(); return updatedRe; @@ -840,7 +840,7 @@ public class RepositoryManager { //fetch the values updatedRe.getStatistics().getLaunchCounter(); if(updatedRe.getLifecycle() != null) { - updatedRe.getLifecycle().getKey(); + updatedRe.getLifecycle().getCreationDate(); } dbInstance.commit();