Skip to content
Snippets Groups Projects
Commit 90002567 authored by srosse's avatar srosse
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_14.2'

parents 968744ee e0bdffd8
No related branches found
No related tags found
No related merge requests found
...@@ -165,6 +165,7 @@ view=Ansehen ...@@ -165,6 +165,7 @@ view=Ansehen
view.template=Raumvorlage "{0}" view.template=Raumvorlage "{0}"
warning.at.least.one.meeting=Sie m\u00FCssen mindestens ein Meeting w\u00E4hlen. warning.at.least.one.meeting=Sie m\u00FCssen mindestens ein Meeting w\u00E4hlen.
warning.meeting.started=Sie k\u00F6nnen ein gestartetes Meeting nicht mehr bearbeiten. warning.meeting.started=Sie k\u00F6nnen ein gestartetes Meeting nicht mehr bearbeiten.
warning.no.access=Sie k\u00F6nnen noch nicht den Meeting beitreten.
warning.template.in.use=Die Raumvorlage kann nicht gel\u00F6scht werden da sie nocht benutzt wird. L\u00F6schschen Sie zuerst die entsprechenden Online-Termine oder deaktivieren Sie die Raumvorlage. warning.template.in.use=Die Raumvorlage kann nicht gel\u00F6scht werden da sie nocht benutzt wird. L\u00F6schschen Sie zuerst die entsprechenden Online-Termine oder deaktivieren Sie die Raumvorlage.
wizard.dates.title=Datum wizard.dates.title=Datum
wizard.meeting.title=Konfiguration wizard.meeting.title=Konfiguration
...@@ -165,6 +165,7 @@ view=View ...@@ -165,6 +165,7 @@ view=View
view.template=Room-template "{0}" view.template=Room-template "{0}"
warning.at.least.one.meeting=You must select at least one meeting. warning.at.least.one.meeting=You must select at least one meeting.
warning.meeting.started=You cannot edit a started meeting anymore. warning.meeting.started=You cannot edit a started meeting anymore.
warning.no.access=You cannot access the meeting yet.
warning.template.in.use=The room-template cannot be deleted because it is used by online-meetings. Delete the corresponding online-meeting or de-activate the room-template. warning.template.in.use=The room-template cannot be deleted because it is used by online-meetings. Delete the corresponding online-meeting or de-activate the room-template.
wizard.dates.title=Dates wizard.dates.title=Dates
wizard.meeting.title=Configuration wizard.meeting.title=Configuration
...@@ -110,4 +110,5 @@ template.name=Nom ...@@ -110,4 +110,5 @@ template.name=Nom
templates.title=Mod\u00E8les templates.title=Mod\u00E8les
view=Regarder view=Regarder
view.template=Mod\u00E8le de salle de r\u00E9union "{0}" view.template=Mod\u00E8le de salle de r\u00E9union "{0}"
warning.no.access=Vous ne pouvez pas encore acc\u00E9der au meeting.
warning.template.in.use=Le mod\u00E8le ne peut pas \u00EAtre effacer car il est encore utilis\u00E9. warning.template.in.use=Le mod\u00E8le ne peut pas \u00EAtre effacer car il est encore utilis\u00E9.
...@@ -221,10 +221,13 @@ public class PageMetadataController extends BasicController { ...@@ -221,10 +221,13 @@ public class PageMetadataController extends BasicController {
List<File> documents = null; List<File> documents = null;
File storage = fileStorage.getAssignmentDirectory(assignment); File storage = fileStorage.getAssignmentDirectory(assignment);
if(storage != null) { if(storage != null && storage.exists()) {
documents = Arrays.<File>asList(storage.listFiles(SystemFileFilter.DIRECTORY_FILES)); File[] files = storage.listFiles(SystemFileFilter.DIRECTORY_FILES);
if(!documents.isEmpty()) { if(files != null && files.length > 0) {
needMapper = true; documents = Arrays.<File>asList(files);
if(!documents.isEmpty()) {
needMapper = true;
}
} }
} }
......
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