Merge remote-tracking branch 'origin/Main-UI' into Main-UI

This commit is contained in:
2025-09-04 22:06:35 +03:30
2 changed files with 6 additions and 4 deletions
@@ -229,7 +229,6 @@ public class AddMembersController {
JSONObject resp = ActionHandler.sendWithResponse(batchReq); JSONObject resp = ActionHandler.sendWithResponse(batchReq);
if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) { if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
Platform.runLater(() -> { Platform.runLater(() -> {
showToast("Members added.");
MainController.getInstance().closeOverlay(addMembersCard.getParent()); MainController.getInstance().closeOverlay(addMembersCard.getParent());
}); });
return; return;
@@ -249,7 +248,9 @@ public class AddMembersController {
} }
boolean finalAllOk = allOk; boolean finalAllOk = allOk;
Platform.runLater(() -> { Platform.runLater(() -> {
showToast(finalAllOk ? "Members added." : "Some members failed."); if (!finalAllOk) {
showToast("Some members failed.");
}
MainController.getInstance().closeOverlay(addMembersCard.getParent()); MainController.getInstance().closeOverlay(addMembersCard.getParent());
}); });
}).start(); }).start();
@@ -221,7 +221,6 @@ public class AddSubscriberController {
JSONObject resp = ActionHandler.sendWithResponse(batchReq); JSONObject resp = ActionHandler.sendWithResponse(batchReq);
if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) { if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
Platform.runLater(() -> { Platform.runLater(() -> {
showToast("Subscribers added.");
MainController.getInstance().closeOverlay(addMembersCard.getParent()); MainController.getInstance().closeOverlay(addMembersCard.getParent());
}); });
return; return;
@@ -241,7 +240,9 @@ public class AddSubscriberController {
} }
boolean finalAllOk = allOk; boolean finalAllOk = allOk;
Platform.runLater(() -> { Platform.runLater(() -> {
showToast(finalAllOk ? "Subscribers added." : "Some subscribers failed."); if (!finalAllOk) {
showToast("Some subscribers failed.");
}
MainController.getInstance().closeOverlay(addMembersCard.getParent()); MainController.getInstance().closeOverlay(addMembersCard.getParent());
}); });
}).start(); }).start();