From 1b3b5ab94a15b0339398b30ce09f6c9d42e80cdf Mon Sep 17 00:00:00 2001
From: Vito Albano <valbano@MacPro.local>
Date: Tue, 18 Oct 2016 00:28:27 +0100
Subject: [PATCH] added visibility model to container

---
 .../src/components/widgets/core/container.model.ts          | 3 +++
 .../src/services/widget-visibility.service.ts               | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.ts
index dfeaf231b9..a6fab0e6f6 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.ts
@@ -21,6 +21,7 @@ import { ContainerColumnModel } from './container-column.model';
 import { FormFieldTypes } from './form-field-types';
 import { FormModel } from './form.model';
 import { FormFieldModel } from './form-field.model';
+import { WidgetVisibilityModel } from '../../../models/widget-visibility.model';
 
 // TODO: inherit FormFieldModel
 export class ContainerModel extends FormWidgetModel {
@@ -32,6 +33,7 @@ export class ContainerModel extends FormWidgetModel {
     tab: string;
     numberOfColumns: number = 1;
     params: FormFieldMetadata = {};
+    visibilityCondition: WidgetVisibilityModel = null;
 
     columns: ContainerColumnModel[] = [];
     isExpanded: boolean = true;
@@ -71,6 +73,7 @@ export class ContainerModel extends FormWidgetModel {
             this.tab = json.tab;
             this.numberOfColumns = <number> json.numberOfColumns;
             this.params = <FormFieldMetadata> json.params || {};
+            this.visibilityCondition = <WidgetVisibilityModel> json.visibilityCondition;
 
             let columnSize: number = 12;
             if (this.numberOfColumns > 1) {
diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
index 4a75da4613..8b3a632dab 100644
--- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
+++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
@@ -81,8 +81,10 @@ export class WidgetVisibilityService {
     }
 
     getLeftValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
-        return this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList) ||
-            this.getFormValue(form, visibilityObj.leftFormFieldId);
+        if (visibilityObj.leftRestResponseId) {
+            return this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList);
+        }
+        return this.getFormValue(form, visibilityObj.leftFormFieldId);
     }
 
     getRightValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {