You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/06/26 18:03:01 UTC

[isis] branch master updated: ISIS-2340: vaa: add missing action buttons

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new bd7c4ca  ISIS-2340: vaa: add missing action buttons
bd7c4ca is described below

commit bd7c4ca45aaa929dc53dffcd574b15f1c64f39d6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 26 20:01:04 2020 +0200

    ISIS-2340: vaa: add missing action buttons
---
 .../vaadin/ui/components/object/ObjectViewVaa.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
index 865a84d..e756ab0 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectViewVaa.java
@@ -152,6 +152,12 @@ public class ObjectViewVaa extends VerticalLayout {
             protected HasComponents newFieldSet(HasComponents container, FieldSet fieldSetData) {
 
                 container.add(new H2(fieldSetData.getName()));
+                
+                // handle associated actions
+                val actionBar = newActionPanel(container);
+                for(val actionData : fieldSetData.getActions()) {
+                    onAction(actionBar, actionData);
+                }
 
                 val uiFieldSet = new FormLayout();
                 container.add(uiFieldSet);
@@ -193,6 +199,13 @@ public class ObjectViewVaa extends VerticalLayout {
                     val uiProperty = uiComponentFactory
                             .componentFor(UiComponentFactory.Request.of(Where.OBJECT_FORMS, managedProperty));
                     container.add(uiProperty);
+                    
+                    // handle associated actions
+                    val actionBar = newActionPanel(container);
+                    for(val actionData : propertyData.getActions()) {
+                        onAction(actionBar, actionData);
+                    }
+                    
                 });
             }
 
@@ -207,6 +220,12 @@ public class ObjectViewVaa extends VerticalLayout {
                 .ifPresent(managedCollection -> {
                     container.add(new H3(managedCollection.getName()));
                     
+                    // handle associated actions
+                    val actionBar = newActionPanel(container);
+                    for(val actionData : collectionData.getActions()) {
+                        onAction(actionBar, actionData);
+                    }
+                    
                     val uiCollection = TableViewVaa.forManagedCollection(managedCollection);
                     container.add(uiCollection);
                 });