From 3688f3fc14469d2ad776554ebda83ccc86664068 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Thu, 27 Oct 2016 11:35:07 +0100
Subject: [PATCH] Fix 'group' widget rendering

---
 .../src/components/activiti-form.component.html                | 3 +++
 .../src/components/widgets/core/form.model.ts                  | 2 +-
 .../src/components/widgets/tabs/tabs.widget.html               | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
index 5184026de6..ae6aaaf3c9 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
@@ -19,6 +19,9 @@
                             <div *ngSwitchCase="'container'">
                                 <container-widget [content]="field" (formValueChanged)="checkVisibility($event)"></container-widget>
                             </div>
+                            <div *ngSwitchCase="'group'">
+                                <container-widget [content]="field" (formValueChanged)="checkVisibility($event)"></container-widget>
+                            </div>
                             <div *ngSwitchCase="'dynamic-table'">
                                 <dynamic-table-widget [content]="field"></dynamic-table-widget>
                             </div>
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts
index 5e9cc7b44d..579f0da38e 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts
@@ -170,7 +170,7 @@ export class FormModel {
         let result: FormWidgetModel[] = [];
 
         for (let field of fields) {
-            if (field.type === FormFieldTypes.CONTAINER) {
+            if (field.type === FormFieldTypes.CONTAINER || field.type === FormFieldTypes.GROUP ) {
                 result.push(new ContainerModel(this, field));
             } else if (field.type === FormFieldTypes.DYNAMIC_TABLE) {
                 result.push(new DynamicTableModel(this, field));
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html
index 39664b5b7f..0b09df138e 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html
@@ -17,6 +17,9 @@
                      <div *ngSwitchCase="'container'">
                         <container-widget [content]="field" (formValueChanged)="tabChanged($event);"></container-widget>
                      </div>
+                     <div *ngSwitchCase="'group'">
+                        <container-widget [content]="field" (formValueChanged)="tabChanged($event);"></container-widget>
+                     </div>
                      <div *ngSwitchCase="'dynamic-table'">
                          <dynamic-table-widget [content]="field"></dynamic-table-widget>
                      </div>