Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion AppBuilder/core
Submodule core updated from 03d420 to f6531c
3 changes: 2 additions & 1 deletion AppBuilder/platform/dataFields/ABFieldList.js
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,10 @@ function _getSelectedOptions(field, rowData = {}) {

// Pull text with current language
if (field.settings) {
const resultArray = Array.isArray(result) ? result : [result];
result = (field.settings.options || []).filter((opt) => {
return (
(result || []).filter(
resultArray.filter(
(v) => opt && v && (opt.id || opt) == (v.id || v)
).length > 0
);
Expand Down
4 changes: 2 additions & 2 deletions AppBuilder/platform/plugins/ABClassUIPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export default class ABClassUIPlugin extends ClassUI {
get CurrentView() {
return this.CurrentApplication?.views(
(v) => v.id == this.CurrentViewID
)[0];
)?.[0];
}

/**
Expand All @@ -204,7 +204,7 @@ export default class ABClassUIPlugin extends ClassUI {
* icon: {string} the icon to display
*/
datacollectionsIncluded() {
return this.CurrentApplication?.datacollectionsIncluded()
return (this.CurrentApplication?.datacollectionsIncluded() || [])
.filter((dc) => {
const obj = dc.datasource;
return (
Expand Down
Loading