Skip to content

Commit 0938658

Browse files
committed
Merge branch 'develop' of https://github.com/dinesh-aot/EPIC.compliance into COMP-394
2 parents 432e744 + 3272f2f commit 0938658

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

compliance-web/nginx/nginx.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ http {
4545
# add_header X-XSS-Protection 1;
4646
# add_header X-Frame-Options SAMEORIGIN;
4747
add_header Access-Control-Allow-Origin *;
48-
add_header Access-Control-Allow-Methods GET, POST, OPTIONS;
49-
add_header Access-Control-Allow-Headers Content-Type, Authorization;
48+
add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS, PUT, DELETE';
5049

5150
listen 8080;
5251
server_name _;

compliance-web/src/components/App/Inspections/Profile/Reports/ReportTopSection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export default function ReportTopSection() {
104104
[
105105
IRProgressEnum.PRELIMINARY_DRAFTING,
106106
IRProgressEnum.FINALIZING_RECORD,
107-
].includes(inspectionReportsData?.ir_progress as IRProgressEnum) &&
107+
].includes(inspectionReportsData?.ir_progress as IRProgressEnum) ||
108108
isDisableApprovalButton
109109
);
110110
}, [inspectionReportsData, isDisableApprovalButton]);

0 commit comments

Comments
 (0)