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

Jump to bottom

bugfix/FOUR-19806: Collection columns not selected in Edit Screens are deleted when Draft data is recovered in task using CollectionRecordControl #1761

Merged
merged 3 commits into from
Oct 29, 2024
Merged

bugfix/FOUR-19806: Collection columns not selected in Edit Screens are deleted when Draft data is recovered in task using CollectionRecordControl #1761

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7768e0e
Fixing collection issue with draft data recovered on task
CarliPinell Oct 25, 2024
9d4c105
Merge branch 'release-2024-fall' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 28, 2024
18d73cb
Merge branch 'release-2024-fall' into bugfix/FOUR-19806
nolanpro Oct 29, 2024
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
3 changes: 2 additions & 1 deletion src/components/renderer/form-collection-record-control.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<script>
import VueFormRenderer from "../vue-form-renderer.vue";
import CollectionRecordsList from "../inspector/collection-records-list.vue";
import _ from 'lodash';

const globalObject = typeof window === "undefined" ? global : window;

Expand Down Expand Up @@ -184,7 +185,7 @@ export default {
if(this.taskDraft?.draft?.data == null || this.taskDraft.draft.data === '') {
this.localData = respData;
}else{
this.localData = this.taskDraft.draft.data;
this.localData = _.merge({}, respData, this.taskDraft.draft.data);
}

})
Expand Down
Loading