Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Filter globally removed models from originalChildModels for restore #196

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Fix: Filter globally removed models from originalChildModels for restore #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions js/adapt-assessmentArticleModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ const AssessmentModel = {
Object.defineProperty(this, '_originalChildModels', {
get() {
// Perform this upon request as trickle button addition will change the children
if (this._originalChildModelsStore) return this._originalChildModelsStore;
if (this._originalChildModelsStore) {
// Remove any models that were removed globally
this._originalChildModelsStore = this._originalChildModelsStore.filter(model => data.hasId(model.get('_id')));
return this._originalChildModelsStore;
}
// save original children
this._originalChildModelsStore = this.getChildren().models;
this._setAssessmentOwnershipOnChildrenModels();
Expand Down Expand Up @@ -176,8 +180,8 @@ const AssessmentModel = {
logging.warn('assessment: Not enough unique questions to create a fresh assessment, using last selection');
} else {
// reattach any removed non-block children, trickle buttons etc
const outsideModels = this._originalChildModels.filter(model => model.get('_type') !== 'block')
quizModels = quizModels.concat(outsideModels)
const outsideModels = this._originalChildModels.filter(model => model.get('_type') !== 'block');
quizModels = quizModels.concat(outsideModels);
}
this.getChildren().reset(quizModels);
this.setupCurrentQuestionComponents();
Expand Down
Loading