From 980904f86e2612bdaf2caf31f15ab021e65874b5 Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivan@opensupports.com>
Date: Thu, 8 Dec 2016 14:30:19 -0300
Subject: [PATCH] Guillermo - staff/edit[skip ci]

---
 client/src/data/fixtures/staff-fixtures.js | 1 +
 server/controllers/staff/get-all.php       | 1 +
 server/models/Department.php               | 2 +-
 server/models/Staff.php                    | 4 +++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/data/fixtures/staff-fixtures.js b/client/src/data/fixtures/staff-fixtures.js
index 4aadb436..97d3fe28 100644
--- a/client/src/data/fixtures/staff-fixtures.js
+++ b/client/src/data/fixtures/staff-fixtures.js
@@ -536,6 +536,7 @@ module.exports = [
                     pages: 4
                 }
             }
+
         }
     },
     {
diff --git a/server/controllers/staff/get-all.php b/server/controllers/staff/get-all.php
index 12f027c6..13428201 100644
--- a/server/controllers/staff/get-all.php
+++ b/server/controllers/staff/get-all.php
@@ -27,6 +27,7 @@ class GetAllStaffController extends Controller {
             }
 
             $staffArray[] = [
+                'id' => $staff->id,
                 'name' => $staff->name,
                 'email' => $staff->email,
                 'profilePic' => $staff->profilePic,
diff --git a/server/models/Department.php b/server/models/Department.php
index f2abbaa0..58d8cd38 100644
--- a/server/models/Department.php
+++ b/server/models/Department.php
@@ -7,7 +7,7 @@ class Department extends DataStore {
     public static function getProps() {
         return [
             'name',
-            'sharedTicketList',
+            'sharedTicketList'
         ];
     }
 
diff --git a/server/models/Staff.php b/server/models/Staff.php
index 02e72cf3..d2895eb4 100644
--- a/server/models/Staff.php
+++ b/server/models/Staff.php
@@ -30,9 +30,11 @@ class Staff extends DataStore {
     public static function getUser($value, $property = 'id') {
         return parent::getDataStore($value, $property);
     }
+
     public function toArray() {
         return [
-            'name'=> $this->name,
+            'id' => $this->id,
+            'name' => $this->name,
             'email' => $this->email,
             'profilePic' => $this->profilePic,
             'level' => $this->level,