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

Bugfix/FOUR-19277: Collection Record control displays different errors when mustache variable is assigned in the record ID field #1753

Merged
merged 5 commits into from
Oct 25, 2024
Merged

Bugfix/FOUR-19277: Collection Record control displays different errors when mustache variable is assigned in the record ID field #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02ee4a3
Fixing mustache syntax in Form Collection Record Control
CarliPinell Oct 22, 2024
11c48b9
fixing nustache bug in form collection view
CarliPinell Oct 23, 2024
a492f41
removing consoles
CarliPinell Oct 23, 2024
b43857d
Merge branch 'release-2024-fall' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 23, 2024
995aa91
removing unused imports
CarliPinell Oct 23, 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
6 changes: 3 additions & 3 deletions 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 @@ -179,7 +179,7 @@ export default {
this.selDisplayMode === "View" ? viewScreen : editScreen;

this.loadScreen(this.screenCollectionId);

//This section validates if Collection has draft data
if(this.taskDraft?.draft?.data == null || this.taskDraft.draft.data === '') {
this.localData = respData;
Expand Down Expand Up @@ -212,9 +212,9 @@ export default {
},
record(record) {
this.hasMustache = false;
if (record && !isNaN(record) && record > 0 && this.collection) {
if (record && !isNaN(record) && record > 0 && this.collection.collectionId) {
this.selRecordId = record;
this.loadRecordCollection(this.selCollectionId, record, this.collectionmode);
this.loadRecordCollection(this.collection.collectionId, record, this.selDisplayMode);
} else {
if (this.isMustache(record)) {
this.callbackRecord();
Expand Down
4 changes: 2 additions & 2 deletions src/components/renderer/form-collection-view-control.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ export default {
},
record(record) {
this.hasMustache = false;
if (record && !isNaN(record) && record > 0 && this.collection) {
if (record && !isNaN(record) && record > 0 && this.collection.collectionId) {
this.selRecordId = record;
this.loadRecordCollection(this.selCollectionId, record, this.collectionmode);
this.loadRecordCollection(this.collection.collectionId, record, this.collectionmode);
} else {
if (this.isMustache(record)) {
this.callbackRecord();
Expand Down
Loading