From 8893eebaffd0b46523c0e1d779a19a97b8fe7598 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Sat, 15 Oct 2022 17:02:35 +0200
Subject: [PATCH] Another bugfix for the import, wrong property was used in
 XHTML file

---
 .../libreccm/ui/admin/imexport/ImportTaskStatus.java | 12 ++++++++++++
 .../org/libreccm/ui/admin/imexport/imexport.xhtml    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
index 24b2ea62a..948249ef1 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
@@ -75,6 +75,18 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
         this.status = status;
     }
 
+    public boolean isRunning() {
+        return status == ImExportTaskStatus.RUNNING;
+    }
+    
+    public boolean isFinished() {
+        return status == ImExportTaskStatus.FINISHED;
+    }
+    
+    public boolean isError() {
+        return status == ImExportTaskStatus.ERROR;
+    }
+    
     public Throwable getException() {
         return exception;
     }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
index 2db0f156f..89f97b78c 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
@@ -125,7 +125,7 @@
                                             <td>#{task.started}</td>
                                             <td>
                                                 <c:choose>
-                                                    <c:when test="#{task.done}">
+                                                    <c:when test="#{task.finished}">
                                                         #{AdminMessages['imexport.activeimports.table.columns.status.finished']}
                                                     </c:when>
                                                     <c:otherwise>