From 158539da56463ef768279b3cc107783dee9601dd Mon Sep 17 00:00:00 2001 From: Jordan Yoshihara Date: Tue, 19 Jan 2021 15:56:09 -0800 Subject: [PATCH] Switched order in which incomplete and uploading node validation messages are shown --- .../frontend/channelEdit/components/edit/EditModal.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue index 42d524de35..a72f33227d 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue @@ -394,11 +394,11 @@ // Wait for nextTick to let the Vuex mutation propagate this.$nextTick().then(() => { // Catch uploads in progress and invalid nodes - if (this.contentNodesAreUploading(this.nodeIds)) { - this.promptUploading = true; - } else if (this.invalidNodes.length) { + if (this.invalidNodes.length) { this.selected = [this.invalidNodes[0]]; this.promptInvalid = true; + } else if (this.contentNodesAreUploading(this.nodeIds)) { + this.promptUploading = true; } else { this.closeModal(); }