Merge pull request #74 from FAC-11/emptyform-bug

#53 fixes bug which stopped sections from loading
FAC-11 · Oct 12, 2017 · 4d827c6 · 4d827c6
2 parents bf5cfe1 + 126cdf1
commit 4d827c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/controllers/appointments.js b/src/controllers/appointments.js
@@ -10,7 +10,7 @@ exports.get = (req, res) => {
     getSection(req.session.id, 'appointments'),
     getSection(req.session.id, 'closing'),
   ]).then((dataArr) => {
-    const data = Object.assign(dataArr[0], dataArr[1]);
+    const data = Object.assign(dataArr[0] || {}, dataArr[1] || {});
     // for ticking correct checkbox based on previously saved answer
     const contactMethods = data.contact_preference ? data.contact_preference.replace(/\{|\}/g, '').split(',') : [];
     let checked = {

diff --git a/src/controllers/symptoms.js b/src/controllers/symptoms.js
@@ -7,7 +7,7 @@ exports.get = (req, res) => {
   getSection(req.session.id, 'symptoms')
     .then((data) => {
       let checked = {
-        agreement: { [data.diagnosis_agreement]: true },
+        agreement: { [data ? data.diagnosis_agreement : '']: true },
       };
       res.render('symptoms', {
         activePage: { symptoms: true },