From c36d430fc882fdcd74472e56c5f7633536b92c28 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Mon, 12 Sep 2016 13:08:05 +0100
Subject: [PATCH] #724 correctly handle 'formKey' property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

due to some reason Activiti stores/serializes null as a “null” string
rather than value for a ‘formKey’ property; added checks for this case
---
 .../activiti-task-details.component.html      |  6 ++--
 .../activiti-task-details.component.ts        | 36 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
index 5b91551dbc..c447fabcad 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="!taskDetails">
+<div *ngIf="!hasFormKey()">
     <template *ngIf="noTaskDetailsTemplateComponent" ngFor [ngForOf]="[data]"
               [ngForTemplate]="noTaskDetailsTemplateComponent">
         {{ 'TASK_DETAILS.MESSAGES.NONE' | translate }}
@@ -7,7 +7,7 @@
         {{ 'TASK_DETAILS.MESSAGES.NONE' | translate }}
     </div>
 </div>
-<div *ngIf="taskDetails">
+<div *ngIf="hasFormKey()">
     <h2 class="mdl-card__title-text">{{taskDetails.name}}</h2>
     <activiti-task-header [taskDetails]="taskDetails" #activitiheader></activiti-task-header>
     <div class="mdl-grid">
@@ -21,7 +21,7 @@
             <activiti-checklist [taskId]="taskId" #activitichecklist></activiti-checklist>
         </div>
     </div>
-    <activiti-form *ngIf="taskDetails.formKey" [taskId]="taskId"
+    <activiti-form *ngIf="hasFormKey()" [taskId]="taskId"
                    [showTitle]="showTitle"
                    [showRefreshButton]="showRefreshButton"
                    [showCompleteButton]="showCompleteButton"
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
index f02bb586f4..5154c8baaf 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
@@ -117,6 +117,12 @@ export class ActivitiTaskDetails implements OnInit {
         this.taskDetails = null;
     }
 
+    hasFormKey() {
+        return this.taskDetails
+            && this.taskDetails.formKey
+            && this.taskDetails.formKey !== 'null';
+    }
+
     /**
      * Load the activiti task details
      * @param taskId
@@ -130,26 +136,24 @@ export class ActivitiTaskDetails implements OnInit {
                     this.taskDetails = res;
 
                     let endDate: any = res.endDate;
-                    if (endDate && !isNaN(endDate.getTime())) {
-                        this.readOnly = true;
-                    } else {
-                        this.readOnly = false;
-                    }
+                    this.readOnly = !!(endDate && !isNaN(endDate.getTime()));
 
-                    if (this.taskDetails && this.taskDetails.involvedPeople) {
-                        this.taskDetails.involvedPeople.forEach((user) => {
-                            this.taskPeople.push(new User(user.id, user.email, user.firstName, user.lastName));
-                        });
+                    if (this.hasFormKey()) {
+                        if (this.taskDetails && this.taskDetails.involvedPeople) {
+                            this.taskDetails.involvedPeople.forEach((user) => {
+                                this.taskPeople.push(new User(user.id, user.email, user.firstName, user.lastName));
+                            });
 
-                        if (this.activiticomments) {
-                            this.activiticomments.load(this.taskDetails.id);
-                        }
-
-                        if (this.activitichecklist) {
-                            this.activitichecklist.load(this.taskDetails.id);
+                            if (this.activiticomments) {
+                                this.activiticomments.load(this.taskDetails.id);
+                            }
+
+                            if (this.activitichecklist) {
+                                this.activitichecklist.load(this.taskDetails.id);
+                            }
                         }
+                        console.log(this.taskDetails);
                     }
-                    console.log(this.taskDetails);
                 }
             );
         } else {