diff --git a/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js index 93ece19be..b5098cbf4 100644 --- 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 index fea8c8643..1b82d62cd 100644 --- 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 index b68f3f5b1..51e38e7c7 100644 --- 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']