Update task status on unlock, add task id to upload question

Signed-off-by: Taylor Smock <[email protected]>
JOSM · May 30, 2024 · 1f6b86c · 1f6b86c
1 parent 67cd1ef
commit 1f6b86c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...n/java/org/openstreetmap/josm/plugins/maproulette/gui/task/list/LockUnlockTaskAction.java b/...n/java/org/openstreetmap/josm/plugins/maproulette/gui/task/list/LockUnlockTaskAction.java
@@ -19,7 +19,6 @@
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.maproulette.api.TaskAPI;
-import org.openstreetmap.josm.plugins.maproulette.api.enums.TaskStatus;
 import org.openstreetmap.josm.plugins.maproulette.api.model.Task;
 import org.openstreetmap.josm.plugins.maproulette.gui.ModifiedObjects;
 import org.openstreetmap.josm.plugins.maproulette.gui.layer.MapRouletteClusteredPointLayer;
@@ -112,7 +111,7 @@ private void unlockTasks() {
                 final var unlockedTask = TaskAPI.release(cluster.id());
                 if (task != null && task.id() == unlockedTask.id()) {
                     final var modified = ModifiedObjects.getModifiedTask(task.id());
-                    if (modified != null && modified.status() != TaskStatus.FIXED) {
+                    if (modified != null) {
                         TaskAPI.updateStatus(task.id(), modified.status(), modified.comment(), modified.tags(),
                                 modified.reviewRequested(), modified.completionResponses());
                         ModifiedObjects.removeModifiedTask(modified);

diff --git a/src/main/java/org/openstreetmap/josm/plugins/maproulette/io/upload/EarlyUploadHook.java b/src/main/java/org/openstreetmap/josm/plugins/maproulette/io/upload/EarlyUploadHook.java
@@ -107,8 +107,8 @@ public boolean checkUpload(APIDataSet apiDataSet) {
                 final var descriptivePanel = createDescriptivePanel(task, apiDataSet);
                 final var didFix = ConditionalOptionPaneUtil.showConfirmationDialog(PREF_CHECK_IF_FINISHED,
                         MainApplication.getMainFrame(), descriptivePanel,
-                        tr("Did you finish the following MapRoulette Task?"), JOptionPane.YES_NO_CANCEL_OPTION,
-                        JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION);
+                        tr("Did you finish the following MapRoulette Task: {0}?", task.id()),
+                        JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION);
                 if (didFix) {
                     final var doc = (HTMLDocument) ((JosmEditorPane) descriptivePanel.getComponent(1)).getDocument();
                     ModifiedObjects.addModifiedTask(