From 580ef69e2e491be677b15f43d310b9493bce9346 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 25 Sep 2017 13:56:00 +0300
Subject: [PATCH] Working on time tracker

---
 resources/views/tasks/time_tracker.blade.php          |  1 -
 resources/views/tasks/time_tracker_knockout.blade.php | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index f0aad2dcc661..6b08a31cb2ac 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -263,7 +263,6 @@
 		}
 
 		function refreshProjectList(forceClear) {
-			console.log('refreshProjectList...');
 			var clientId = $('input[name=client_id]').val();
 			$projectCombobox = $('select#project_id');
 			$projectCombobox.find('option').remove().end().combobox('refresh');
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index d796f14aa5ef..74161f4fb2c9 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -425,24 +425,24 @@
                 success: function(response) {
                     console.log(response);
                     if (isSelected) {
-                        var isNew = !self.public_id();
-                        self.update(response);
-                        model.formChanged(false);
                         var clientId = $('input[name=client_id]').val();
-                        if (clientId) {
+                        if (clientId == -1 && response.client) {
                             var client = response.client;
                             clients.push(client);
                             addClientToMaps(client);
                             refreshClientList();
                         }
                         var projectId = $('input[name=project_id]').val();
-                        if (projectId == -1) {
+                        if (projectId == -1 && response.project) {
                             var project = response.project;
                             project.client = response.client;
                             projects.push(project);
                             addProjectToMaps(project);
                             refreshProjectList();
                         }
+                        var isNew = !self.public_id();
+                        self.update(response);
+                        model.formChanged(false);
                         if (isNew) {
                             toastr.success("{{ trans('texts.created_task') }}");
                         } else {