Merge pull request #20 from MoodleSync/feature/download

Further minor bug fixes.
MoodleSync · Jul 7, 2023 · 1019a77 · 1019a77
2 parents c72d6a1 + e46384e
commit 1019a77
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/moodle-sync-fx/src/main/java/moodle/sync/javafx/custom/AvailabilityCheckBoxCell.java b/moodle-sync-fx/src/main/java/moodle/sync/javafx/custom/AvailabilityCheckBoxCell.java
@@ -44,7 +44,7 @@ public void updateItem(Boolean item, boolean empty) {
         } else if (getTableRow() != null) {
             if (getTableRow().getItem() != null && (!getTableRow().getItem().isSelectable() ||
                     getTableRow().getItem().getAction() == MoodleAction.UploadSection || getTableRow().getItem().getAction() == MoodleAction.ExistingFile
-                    || getTableRow().getItem().getAction() == MoodleAction.NotLocalFile)) {
+                    || getTableRow().getItem().getAction() == MoodleAction.NotLocalFile || getTableRow().getItem().getAction() == MoodleAction.FolderSynchronize)) {
                 checkBox.setAlignment(Pos.CENTER);
                 setDisable(false);
                 setGraphic(null);

diff --git a/moodle-sync-fx/src/main/java/moodle/sync/javafx/custom/LocalDateTimeCell.java b/moodle-sync-fx/src/main/java/moodle/sync/javafx/custom/LocalDateTimeCell.java
@@ -42,7 +42,7 @@ public void updateItem(TimeDateElement item, boolean empty) {
             timePicker.timeProperty().unbindBidirectional(getTableRow().getItem().availabilityDateTimeProperty().get().LocalTimeProperty());
             if (getTableRow().getItem() != null && (!getTableRow().getItem().isSelectable() ||
                     getTableRow().getItem().getAction() == MoodleAction.UploadSection || getTableRow().getItem().getAction() == MoodleAction.ExistingFile ||
-                    getTableRow().getItem().getAction() == MoodleAction.NotLocalFile)) {
+                    getTableRow().getItem().getAction() == MoodleAction.NotLocalFile || getTableRow().getItem().getAction() == MoodleAction.FolderSynchronize)) {
                 setDisable(false);
                 setGraphic(null);
             }

diff --git a/moodle-sync-fx/src/main/java/moodle/sync/presenter/TrainerPresenter.java b/moodle-sync-fx/src/main/java/moodle/sync/presenter/TrainerPresenter.java
@@ -319,7 +319,9 @@ private void onWiki() {
 
     //Used to remove content in tables.
     private void clearView() {
-        if (guest) {
+        if(isNull(guest)) {
+            view.setDataGuest(FXCollections.observableArrayList());
+        } else if (guest) {
             view.setDataGuest(FXCollections.observableArrayList());
         } else {
             view.setDataTrainer(FXCollections.observableArrayList());