Undo the reverted changes in #4714#4737
Merged
AllanOXDi merged 6 commits intolearningequality:unstablefrom Sep 17, 2024
Merged
Conversation
d53b86d to
35dcb4a
Compare
AlexVelezLl
requested changes
Sep 17, 2024
Member
AlexVelezLl
left a comment
There was a problem hiding this comment.
Thank you @AllanOXDi! I just made some notes. Also noted that we still need to bring back the rest of the original PR, as we have only add the original changes in the EditBooleanMapModal file, but the changes in the rest of files are missing. You can check them here https://github.com/learningequality/studio/pull/4714/files.
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Show resolved
Hide resolved
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Show resolved
Hide resolved
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Show resolved
Hide resolved
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Outdated
Show resolved
Hide resolved
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Show resolved
Hide resolved
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Outdated
Show resolved
Hide resolved
140c15f to
5d24098
Compare
AlexVelezLl
reviewed
Sep 17, 2024
| if (value.includes(node.id)) { | ||
| const currentNode = this.getContentNode(node.id); | ||
| if (this.hasMixedCategories) { | ||
| Object.assign(fieldValue, currentNode[this.field] || {}); |
Member
There was a problem hiding this comment.
Can we keep the comments here for future references.
// If we have mixed categories remain the old ones, and
// just add new categories if there are any
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Show resolved
Hide resolved
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Outdated
Show resolved
Hide resolved
e8881c3 to
5f998c1
Compare
AlexVelezLl
reviewed
Sep 17, 2024
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Show resolved
Hide resolved
AlexVelezLl
reviewed
Sep 17, 2024
...ation/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
Show resolved
Hide resolved
c240deb to
55432b4
Compare
AlexVelezLl
approved these changes
Sep 17, 2024
Member
AlexVelezLl
left a comment
There was a problem hiding this comment.
Thanks @AllanOXDi! Looks good to me!
Merged
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This pull request addresses the issue where the text 'This field is required' is displayed when bulk editing learning activities.
Fixes #4651
Reviewer guidance
How can a reviewer test these changes?
References
#4651
Summary
This pull request addresses the issue where the text 'This field is required' is displayed when bulk editing learning activities.
Fixes #4651
Reviewer guidance
How can a reviewer test these changes?
References
#4651
Comments
Contributor's Checklist
PR process:
CHANGELOGlabel been added to this PR. Note: items with this label will be added to the CHANGELOG at a later timedocslabel has been added if this introduces a change that needs to be updated in the user docs?requirements.txtfiles also included in this PRStudio-specifc:
notranslateclass been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)pages,components, andlayoutsdirectories as described in the docsTesting:
Reviewer's Checklist
This section is for reviewers to fill out.
yarnandpip)