From 5a0df0228772c0159ba536d066d28ea0ad6803af Mon Sep 17 00:00:00 2001
From: Matthew Ross <kiswa.com@gmail.com>
Date: Wed, 27 May 2015 17:59:30 -0400
Subject: [PATCH] User options now sent from API correctly.

---
 api/helpers.php            |  2 +-
 api/userRoutes.php         | 10 ++++++----
 js/controllers/settings.js |  1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/api/helpers.php b/api/helpers.php
index 9973323..f4f5a7d 100644
--- a/api/helpers.php
+++ b/api/helpers.php
@@ -380,7 +380,7 @@ function createInitialUser() {
         $options->showAnimations = true;
         $options->showAssignee = true;
 
-        $admin->ownOptions = $options;
+        $admin->ownOptions[] = $options;
 
         R::store($admin);
     }
diff --git a/api/userRoutes.php b/api/userRoutes.php
index b31bc61..113d089 100644
--- a/api/userRoutes.php
+++ b/api/userRoutes.php
@@ -138,10 +138,12 @@ $app->get('/users/current', function() use($app, $jsonResponse) {
     if (validateToken()) {
         $user = getUser();
         if (null != $user) {
-            $options = [];
-            foreach($user->ownOptions as $option) {
-                $options[] = $option;
-            }
+            $userOptions = R::exportAll($user->ownOption);
+            $options = [
+                'tasksOrder' => $userOptions[0]['tasks_order'],
+                'showAssignee' => $userOptions[0]['show_assignee'],
+                'showAnimations' => $userOptions[0]['show_animations']
+            ];
             $jsonResponse->data = [
                 'userId' => $user->id,
                 'username' => $user->username,
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index 258d601..7b03543 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -22,7 +22,6 @@ function ($scope, UserService, AlertService) {
         .success(function(data) {
             $scope.currentUser = data.data;
             $scope.loadingCurrentUser = false;
-            console.log($scope.currentUser.options[0]);
         });
     };
     $scope.loadCurrentUser();