Skip to content
Snippets Groups Projects
Commit 86c7091f authored by User expired's avatar User expired
Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk

parents 31038c0b 00305fba
No related branches found
No related tags found
No related merge requests found
......@@ -119,14 +119,18 @@
</bean>
<!-- Cleaning job for document editor access -->
<bean id="expiredDocumentAccessDeletionJob" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail">
<bean class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
<property name="jobClass" value="org.olat.core.commons.services.doceditor.manager.ExpiredDocumentAccessDeletionJob" />
</bean>
</property>
<property name="cronExpression" value="52 * * * * ?"/> <!-- Every minute at xx:xx:52 -->
<property name="startDelay" value="45000" />
<bean id="documentAccessDeletionTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="documentAccessDeletionJob.${cluster.singleton.services}" />
<property name="cronExpression" value="* 24 * * * ?" /> <!-- Every hour at xx:24:00 -->
<property name="startDelay" value="10000" />
</bean>
<bean id="documentAccessDeletionJob.enabled" class="org.springframework.scheduling.quartz.JobDetailFactoryBean" lazy-init="true">
<property name="jobClass" value="org.olat.core.commons.services.doceditor.manager.ExpiredDocumentAccessDeletionJob" />
</bean>
<bean id="documentAccessDeletionJob.disabled" class="org.springframework.scheduling.quartz.JobDetailFactoryBean" lazy-init="true">
<property name="jobClass" value="org.olat.core.commons.services.scheduler.DummyJob" />
</bean>
<!-- Cleaning job for CSP reports -->
......
......@@ -60,6 +60,7 @@ How to add a new job:
<ref bean="lifecycleUserTrigger"/>
<ref bean="contactTracingTrigger"/>
<ref bean="recordingSyncTrigger"/>
<ref bean="documentAccessDeletionTrigger"/>
</list>
</property>
</bean>
......
......@@ -233,7 +233,7 @@ state_assigned=Belegt
state_assigned.accountmanager=Teilnehmer akzeptiert
state_complete=Belegt
state_enrolled=Zugewiesen
state_final_enrolled=Definitv zugewiesen
state_final_enrolled=Definitiv zugewiesen
state_not_assigned=Frei
state_not_assigned.accountmanager=Teilnehmer pr\u00FCfen
state_not_assigned.accountmanager.no.candidate=Keine Teilnehmer zu pr\u00FCfen
......
......@@ -104,7 +104,7 @@ confirm.delete.assessment.mode.text=Wollen Sie wirklich diesen Pr\u00FCfungsmodu
confirm.delete.assessment.mode.title=Pr\u00FCfungsmodus l\u00F6schen
confirm.delete.lectures=Wollen Sie wirklich diesen Lektionenblock "{0}" l\u00F6schen?
confirm.delete.lectures.notices=<strong>{0}</strong> Absenze(n) / Abmeldunge(n) f\u00FCr "<strong>{1}</strong>" die nur zu den Lektionbl\u00F6cke geh\u00F6ren werden mit gel\u00F6scht.
confirm.delete.lectures.notices.confirmation=Ich verstehe dass die Absenzen / Abmeldungen definitv gel\u00F6scht werden.
confirm.delete.lectures.notices.confirmation=Ich verstehe dass die Absenzen / Abmeldungen definitiv gel\u00F6scht werden.
confirm.delete.reason=Wollen Sie wirklich diese Begr\u00FCndung "{0}" l\u00F6schen?
contact.teachers=Dozenten kontaktieren
contact.teachers.list.name=Dozenten
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment