Merge pull request #490 from bcgov/release-196-jb5

Release 196 jb5
bcgov · Dec 8, 2023 · 36e3347 · 36e3347
2 parents 2f4a6c8 + 127337b
commit 36e3347
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/components/requestChanges/ChangeFileUpload.vue b/frontend/src/components/requestChanges/ChangeFileUpload.vue
@@ -172,7 +172,7 @@ export default {
 
   computed: {
     ...mapGetters('reportChanges', ['getUploadedDocuments']),
-    ...mapState('reportChanges', ['uploadedDocuments', 'loadedChangeRequest']),
+    ...mapState('reportChanges', ['uploadedDocuments', 'loadedChangeRequest', 'changeRequestMap']),
     ...mapGetters('auth', ['userInfo']),
     ...mapState('application', ['applicationStatus', 'applicationId','formattedProgramYear']),
     ...mapState('navBar', ['changeRequestId']),
@@ -191,7 +191,8 @@ export default {
           return false;
         }
       }
-      return this.loadedChangeRequest?.externalStatus !== 'INCOMPLETE';
+      let currentCR = this.changeRequestMap.get(this.$route.params?.changeRecGuid);
+      return currentCR?.externalStatus !== 'INCOMPLETE';
     },
   },
 

diff --git a/frontend/src/components/requestChanges/ChangeNotificationForm.vue b/frontend/src/components/requestChanges/ChangeNotificationForm.vue
@@ -143,7 +143,7 @@ export default {
       if (currentCR?.unlockChangeRequest || currentCR?.unlockOtherChangesDocuments) {
         return false;
       }
-      return this.loadedChangeRequest?.externalStatus !== 'INCOMPLETE';
+      return currentCR?.externalStatus != 'INCOMPLETE';
     },
   },
   methods: {