diff --git a/src/main/java/org/olat/modules/curriculum/manager/CurriculumDAO.java b/src/main/java/org/olat/modules/curriculum/manager/CurriculumDAO.java index f46c918d904c401e0b6911c0c4c061cfe2290939..58d70ffa31dbb51d2077b1b0b49178b544276b64 100644 --- a/src/main/java/org/olat/modules/curriculum/manager/CurriculumDAO.java +++ b/src/main/java/org/olat/modules/curriculum/manager/CurriculumDAO.java @@ -38,6 +38,7 @@ import org.olat.core.id.Organisation; import org.olat.core.id.OrganisationRef; import org.olat.core.util.StringHelper; import org.olat.modules.curriculum.Curriculum; +import org.olat.modules.curriculum.CurriculumElementStatus; import org.olat.modules.curriculum.CurriculumRef; import org.olat.modules.curriculum.CurriculumRoles; import org.olat.modules.curriculum.model.CurriculumImpl; @@ -173,7 +174,7 @@ public class CurriculumDAO { QueryBuilder sb = new QueryBuilder(512); sb.append("select cur,") .append(" (select count(curElement.key) from curriculumelement curElement") - .append(" where curElement.curriculum.key=cur.key") + .append(" where curElement.curriculum.key=cur.key and curElement.status ").in(CurriculumElementStatus.active, CurriculumElementStatus.inactive) .append(" ) as numOfElements") .append(" from curriculum cur") .append(" inner join fetch cur.group baseGroup") diff --git a/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties index 67d7ed58e23db0d1c7621f6458edfebdeb505538..ea3e83874fd3b70b7ce487cea4a165f992d5e726 100644 --- a/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_de.properties @@ -77,7 +77,7 @@ table.header.end.date=Ende table.header.external.id=Externe ID table.header.identifier=Bezeichnung table.header.key=ID -table.header.num.elements=Elementen +table.header.num.elements=Elemente table.header.repository.entry.displayName=Titel der Lernressource table.header.repository.entry.externalRef=Identifier table.header.resources=Ref. diff --git a/src/main/java/org/olat/repository/RepositoryManager.java b/src/main/java/org/olat/repository/RepositoryManager.java index 63e6268430feb1a8b35b7166f9308afb5f5bd82e..8fd7efaa05b4da33838d69533f9d831a5a5a673a 100644 --- a/src/main/java/org/olat/repository/RepositoryManager.java +++ b/src/main/java/org/olat/repository/RepositoryManager.java @@ -1414,7 +1414,7 @@ public class RepositoryManager { ActionType actionType = ThreadLocalUserActivityLogger.getStickyActionType(); ThreadLocalUserActivityLogger.setStickyActionType(ActionType.admin); try{ - ThreadLocalUserActivityLogger.log(GroupLoggingAction.GROUP_OWNER_REMOVED, getClass(), + ThreadLocalUserActivityLogger.log(GroupLoggingAction.GROUP_PARTICIPANT_REMOVED, getClass(), LoggingResourceable.wrap(re, OlatResourceableType.genRepoEntry), LoggingResourceable.wrap(identity)); } finally { ThreadLocalUserActivityLogger.setStickyActionType(actionType);