From bc532ba81b01df323e2c90b5e301458d53de8278 Mon Sep 17 00:00:00 2001 From: Oliver Foster Date: Wed, 17 Aug 2022 18:25:50 +0100 Subject: [PATCH 1/2] Update: Switch to model.getFeedback allowing more complex feedback objects --- js/TutorModel.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/js/TutorModel.js b/js/TutorModel.js index 457b326..dc07026 100644 --- a/js/TutorModel.js +++ b/js/TutorModel.js @@ -21,9 +21,14 @@ export default class TutorModel extends Backbone.Model { _attributes: { 'data-adapt-id': parentModel.get('_id') }, _id: parentModel.get('_id'), _shouldRenderId: false, - altTitle: parentModel.get('altFeedbackTitle'), - title: parentModel.get('feedbackTitle'), - body: parentModel.get('feedbackMessage') + ...( + parentModel.getFeedback() || + { + altTitle: parentModel.get('altFeedbackTitle'), + title: parentModel.get('feedbackTitle'), + body: parentModel.get('feedbackMessage') + } + ) }); data._classes += ` tutor ${this.getOriginClasses(parentModel)}`; this.set(data); From 4eac4fc4f27893dd0b6b333aa4d3243915e756b3 Mon Sep 17 00:00:00 2001 From: Oliver Foster Date: Tue, 6 Sep 2022 10:29:03 +0100 Subject: [PATCH 2/2] Added guard for backward compatibility --- js/TutorModel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/TutorModel.js b/js/TutorModel.js index dc07026..01afa3c 100644 --- a/js/TutorModel.js +++ b/js/TutorModel.js @@ -22,7 +22,7 @@ export default class TutorModel extends Backbone.Model { _id: parentModel.get('_id'), _shouldRenderId: false, ...( - parentModel.getFeedback() || + parentModel.getFeedback?.() || { altTitle: parentModel.get('altFeedbackTitle'), title: parentModel.get('feedbackTitle'),