Merge branch 'development' into 2661-translation-system

openforis · Oct 15, 2024 · fa8eb20 · fa8eb20
2 parents 3c579c1 + e641fc8
commit fa8eb20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/meta/user/authorizer/canViewReview.ts b/src/meta/user/authorizer/canViewReview.ts
@@ -44,7 +44,7 @@ const hasEditSectionPermission = (
 
   const userRole = Users.getRole(user, countryIso, cycle)
 
-  return countryStatus[userRole.role]?.includes(status) && hasCollaboratorEditSectionPermission(props)
+  return countryStatus[userRole?.role]?.includes(status) && hasCollaboratorEditSectionPermission(props)
 }
 
 /**

diff --git a/src/server/controller/cycleData/getBulkDownload/getNWFP.ts b/src/server/controller/cycleData/getBulkDownload/getNWFP.ts
@@ -48,7 +48,7 @@ export const getNWFP = async (props: Props) => {
     }
 
     const variableSet1 = Array.from({ length: 10 }, (_, i) => `product_${i + 1}`)
-    const colSet1 = ['product_name', 'value', 'category']
+    const colSet1 = ['product_name', 'value', 'category', 'quantity', 'unit']
 
     variableSet1.forEach((variableName) => {
       colSet1.forEach((colName) => {