From 19a3a99844ebde052a000885e039227a3fecf0e7 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Sun, 10 Apr 2016 18:29:30 +0200
Subject: [PATCH] closed #112 fixed DataTables error for missing "status" data
 (signature table)

---
 app/main/model/systemsignaturemodel.php | 37 +++++++++++++------------
 js/app/ui/system_signature.js           |  3 +-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/main/model/systemsignaturemodel.php b/app/main/model/systemsignaturemodel.php
index ee2ebafe..41df0cbf 100644
--- a/app/main/model/systemsignaturemodel.php
+++ b/app/main/model/systemsignaturemodel.php
@@ -103,26 +103,29 @@ class SystemSignatureModel extends BasicModel {
     }
 
     /**
-     * get signature data as array
-     * @return array
+     * get signature data
+     * @return \stdClass
      */
     public function getData(){
 
-        $signatureData = [
-            'id' => $this->id,
-            'groupId' => $this->groupId,
-            'typeId' => $this->typeId,
-            'name' => $this->name,
-            'description' => $this->description,
-            'created' => [
-                'character' => $this->createdCharacterId->getData(),
-                'created' => strtotime($this->created)
-            ],
-            'updated' => [
-                'character' => $this->updatedCharacterId->getData(),
-                'updated' => strtotime($this->updated)
-            ]
-        ];
+        $signatureData                              = (object) [];
+        $signatureData->id                          = $this->id;
+        $signatureData->groupId                     = $this->groupId;
+        $signatureData->typeId                      = $this->typeId;
+        $signatureData->name                        = $this->name;
+        $signatureData->description                 = $this->description;
+
+        $signatureData->created                     = (object) [];
+        $signatureData->created->created            = strtotime($this->created);
+        if( is_object($this->createdCharacterId) ){
+            $signatureData->created->character      = $this->createdCharacterId->getData();
+        }
+
+        $signatureData->updated                     = (object) [];
+        $signatureData->updated->updated            = strtotime($this->updated);
+        if( is_object($this->updatedCharacterId) ){
+            $signatureData->updated->character      = $this->updatedCharacterId->getData();
+        }
 
         return $signatureData;
     }
diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js
index 7a8a85f6..29814a54 100644
--- a/js/app/ui/system_signature.js
+++ b/js/app/ui/system_signature.js
@@ -1422,12 +1422,11 @@ define([
                 tempData.id = sigId;
 
                 // set status --------------------------------------------------------------------------------------
-                var status = '';
                 var statusClass = '';
                 if(data.updated.character !== undefined){
                     statusClass = Util.getStatusInfoForCharacter(data.updated.character, 'class');
                 }
-                status =  '<i class="fa fa-fw fa-circle pf-user-status ' + statusClass + '"></i>';
+                var status = '<i class="fa fa-fw fa-circle pf-user-status ' + statusClass + '"></i>';
 
                 tempData.status = {
                     status: status,