Commit 4a0f6327 by Owen Ryan Ang

added catch if no reject reason

parent 6a65d86d
...@@ -5,7 +5,7 @@ import { goBackToElementListViewer } from "../ElementListWidget/ElementListWidge ...@@ -5,7 +5,7 @@ import { goBackToElementListViewer } from "../ElementListWidget/ElementListWidge
import { createLoadingModal, removeLoadingModal } from "../LoadingModal/LoadingModal.js"; import { createLoadingModal, removeLoadingModal } from "../LoadingModal/LoadingModal.js";
import { PROJECT_CODE } from "../Submit/config.js"; import { PROJECT_CODE } from "../Submit/config.js";
import { ENCODING_PASS, REASON_LIST } from "../config.js"; import { ENCODING_PASS, REASON_LIST } from "../config.js";
import { createInfoModal, createModal } from "../genericPopup/genericPopup.js"; import { createInfoModal, createModal, createErrorModal } from "../genericPopup/genericPopup.js";
import { BPO_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_STORAGE } from "../globalVariable.js"; import { BPO_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_STORAGE } from "../globalVariable.js";
import { getRejectElement } from "./bpoService.js"; import { getRejectElement } from "./bpoService.js";
import { urlUpdateException } from "./gfsService.js"; import { urlUpdateException } from "./gfsService.js";
...@@ -36,7 +36,6 @@ async function rejectElement() { ...@@ -36,7 +36,6 @@ async function rejectElement() {
//isCanvasNotCreated = true; //isCanvasNotCreated = true;
async function successfulReturn() { async function successfulReturn() {
document.getElementById("backdropContainerReject").remove();
if(goBackToElementListViewer()){ if(goBackToElementListViewer()){
resetGDE(); resetGDE();
removeLoadingModal(); removeLoadingModal();
...@@ -164,8 +163,11 @@ export function createRejectWindow() { ...@@ -164,8 +163,11 @@ export function createRejectWindow() {
if (document.querySelector('input[name="rejectRadio"]:checked').value.trim().length != 0) { if (document.querySelector('input[name="rejectRadio"]:checked').value.trim().length != 0) {
saveExceptionToXml(); //save xml saveExceptionToXml(); //save xml
rejectElement(); //reject on bpo rejectElement(); //reject on bpo
document.getElementById("popupContainer").remove(); document.getElementById("backdropContainerReject").remove();
} } else {
createErrorModal(null, "Close", "Reason must not be blank.");
removeLoadingModal();
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment