Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v2' into sync/v2-to-v2-develop-2…
Browse files Browse the repository at this point in the history
…0250129-092558
  • Loading branch information
github-actions[bot] committed Jan 29, 2025
2 parents b7bb47b + 5ee12c8 commit 0f8f49b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gisce/react-ooui",
"version": "2.59.1",
"version": "2.59.2",
"engines": {
"node": "20.5.0"
},
Expand Down
9 changes: 5 additions & 4 deletions src/widgets/base/one2many/One2many.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ export const One2many = (props: Props) => {

if (oouiViews && oouiViews[type]) {
const view = oouiViews[type];
if (!view.toolbar && (type === "form" || type === "tree")) {
const viewWithToolbar: TreeView | FormView = await getViewPromise;
return { ...view, toolbar: viewWithToolbar.toolbar };
}
// TODO: Replace with the new API call to retrieve only the toolbar
// if (!view.toolbar && (type === "form" || type === "tree")) {
// const viewWithToolbar: TreeView | FormView = await getViewPromise;
// return { ...view, toolbar: viewWithToolbar.toolbar };
// }
return view;
}

Expand Down

0 comments on commit 0f8f49b

Please sign in to comment.