Skip to content

bugfix/FOUR-20057: Select a collection label is missing when Record ID field has a variable #1770

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

Merged
ryancooley merged 2 commits into from
Nov 11, 2024
Merged

bugfix/FOUR-20057: Select a collection label is missing when Record ID field has a variable #1770

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1801235
Fixing bug on View Mode in Collection Record Control
CarliPinell Nov 8, 2024
1978444
adding placeholder message
CarliPinell Nov 8, 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
9 changes: 5 additions & 4 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 @@ -167,7 +167,6 @@ export default {
this.selCollectionId = collectionId;
this.selRecordId = recordId;
this.selDisplayMode = modeId;

this.$dataProvider
.getCollectionRecordsView(collectionId, recordId)
.then((response) => {
Expand All @@ -176,9 +175,10 @@ export default {
const viewScreen = response.collection.read_screen_id;
const editScreen = response.collection.update_screen_id;
//Choose screen id regarding of the display Mode
this.screenCollectionId =
this.selDisplayMode === "View" ? viewScreen : editScreen;

this.screenCollectionId =
typeof this.selDisplayMode === 'function' ?
(this.collectionmode.modeId === "View" ? viewScreen : editScreen) :
(this.selDisplayMode === "View" ? viewScreen : editScreen);
this.loadScreen(this.screenCollectionId);

//This section validates if Collection has draft data
Expand All @@ -192,6 +192,7 @@ export default {
.catch(() => {
this.localData = {};
globalObject.ProcessMaker.alert(this.$t('This content does not exist. We could not locate indicated data'), "danger");
this.placeholder = "Select a collection";
});;
},
isMustache(record) {
Expand Down