Merge pull request #5345 from bcgov/dev-rook-RQ-FOIMOD-2975-bugfix

Fix observations in FOIMOD-3300
bcgov · Jul 29, 2024 · 294d8bc · 294d8bc
2 parents 47ea143 + 1057331
commit 294d8bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js
@@ -564,7 +564,7 @@ const FileUploadForMCFPersonal = ({
               sx={{width: "fit-content", marginRight: "8px", marginBottom: "8px"}}
               color="primary"
               size="small"
-              onClick={()=>{handlePersonalTagChange(tag);if(isScanningTeamMember){handleTagChange(tag.divisionid)}}}
+              onClick={()=>{handlePersonalTagChange(tag);}}
               clicked={personalTag?.name === tag.name}
               disabled={!isPersonSelected || trackingID===""}
             />
@@ -662,7 +662,7 @@ const FileUploadForMCFPersonal = ({
                   sx={{width: "fit-content", marginRight: "8px", marginBottom: "8px"}}
                   color="primary"
                   size="small"
-                  onClick={()=>{handlePersonalTagChange(tag);if(isScanningTeamMember){handleTagChange(tag.divisionid)}}}
+                  onClick={()=>{handlePersonalTagChange(tag)}}
                   clicked={personalTag?.name === tag.name}
                 />
               )}

diff --git a/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js
@@ -471,7 +471,7 @@ const MCFPersonal = ({
                     sx={{width: "fit-content", marginRight: "8px", marginBottom: "8px"}}
                     color="primary"
                     size="small"
-                    onClick={()=>{handlePersonalAttributesChange(tag, "personaltag");setNewDivision(tag.divisionid);}}
+                    onClick={()=>{handlePersonalAttributesChange(tag, "personaltag")}}
                     clicked={personalAttributes?.personaltag === tag.name}
                   />
                 )}
@@ -567,7 +567,7 @@ const MCFPersonal = ({
                         sx={{width: "fit-content", marginRight: "8px", marginBottom: "8px"}}
                         color="primary"
                         size="small"
-                        onClick={()=>{handlePersonalAttributesChange(tag, "personaltag");setNewDivision(tag.divisionid);}}
+                        onClick={()=>{handlePersonalAttributesChange(tag, "personaltag")}}
                         clicked={personalAttributes?.personaltag === tag.name}
                       />
                     )}

diff --git a/request-management-api/request_api/services/foirequest/requestserviceministrybuilder.py b/request-management-api/request_api/services/foirequest/requestserviceministrybuilder.py
@@ -58,7 +58,7 @@ def createfoiministryrequestfromobject(self, ministryschema, requestschema, user
         foiministryrequest.cfrduedate = requestdict['cfrduedate']
         foiministryrequest.startdate = requestdict['startdate']
         foiministryrequest.duedate = requestdict['duedate']
-        foiministryrequest.userrecordslockstatus = requestschema['userrecordslockstatus']
+        foiministryrequest.userrecordslockstatus = ministryschema['userrecordslockstatus']
         foiministryrequest.assignedministrygroup = requestdict['assignedministrygroup']
         if 'assignedministryperson' in requestschema and requestschema['assignedministryperson'] not in (None,''):
             foiministryrequest.assignedministryperson = requestschema['assignedministryperson']