LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Bugfix for importer

deploy_packages_to_gitea
Jens Pelzetter 2022-10-15 16:44:02 +02:00
parent 03e7d6dfdf
commit 39920f42f3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
View File

@ -73,7 +73,7 @@ public class ImExportTasks {
task.getStatus().setStatus(ImExportTaskStatus.FINISHED); task.getStatus().setStatus(ImExportTaskStatus.FINISHED);
} }
private void executeImport(final ImportTask task) { void executeImport(final ImportTask task) {
final String importName = task.getName(); final String importName = task.getName();
importExport.importEntities(importName); importExport.importEntities(importName);
task.getStatus().setStatus(ImExportTaskStatus.FINISHED); task.getStatus().setStatus(ImExportTaskStatus.FINISHED);

9
ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
View File

@ -88,13 +88,13 @@ public class ImportExportTaskManager {
public ImportExportTaskManager() { public ImportExportTaskManager() {
exportTasks = new TreeSet<>( exportTasks = new TreeSet<>(
Comparator.comparing( Comparator
ExportTaskStatus::getStarted) .comparing(ExportTaskStatus::getStarted)
.thenComparing(ExportTaskStatus::getName) .thenComparing(ExportTaskStatus::getName)
); );
importTasks = new TreeSet<>( importTasks = new TreeSet<>(
Comparator.comparing( Comparator
ImportTaskStatus::getStarted) .comparing(ImportTaskStatus::getStarted)
.thenComparing(ImportTaskStatus::getName) .thenComparing(ImportTaskStatus::getName)
); );
} }
@ -151,6 +151,7 @@ public class ImportExportTaskManager {
public void importEntities(final String importName) { public void importEntities(final String importName) {
final ImportTaskStatus taskStatus = new ImportTaskStatus(); final ImportTaskStatus taskStatus = new ImportTaskStatus();
taskStatus.setName(importName);
taskStatus.setStarted(LocalDateTime.now()); taskStatus.setStarted(LocalDateTime.now());
importTaskSender.fireAsync( importTaskSender.fireAsync(
new ImportTask(importName, LocalDate.now(), taskStatus) new ImportTask(importName, LocalDate.now(), taskStatus)