From 860aec72a03a8350e45cbc7bec2a52753af41351 Mon Sep 17 00:00:00 2001
From: Mark Friedrich <exodus4d@users.noreply.github.com>
Date: Sat, 1 Dec 2018 15:47:53 +0100
Subject: [PATCH] - improved "jump log" dialog. current ship name and mass
 values are new default values in new "jump log" form. #709

---
 js/app/ui/module/connection_info.js               | 5 +++--
 public/js/v1.4.3/app/ui/module/connection_info.js | 5 +++--
 public/templates/ui/info_panel.html               | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/app/ui/module/connection_info.js b/js/app/ui/module/connection_info.js
index 137dedd5..81172a10 100644
--- a/js/app/ui/module/connection_info.js
+++ b/js/app/ui/module/connection_info.js
@@ -718,7 +718,8 @@ define([
                                     if(currentUserData.character.log){
                                         logData.ship = {
                                             id: currentUserData.character.log.ship.typeId,
-                                            name: currentUserData.character.log.ship.typeName
+                                            name: currentUserData.character.log.ship.typeName,
+                                            mass: currentUserData.character.log.ship.mass
                                         };
                                     }
                                 }
@@ -1107,7 +1108,7 @@ define([
                 selectElementType.initUniverseTypeSelect({
                     categoryIds: [6],
                     maxSelectionLength: 1,
-                    selected: [Util.getObjVal(logData, 'ship.typeId')]
+                    selected: [Util.getObjVal(logData, 'ship.id')]
                 }).on('select2:select select2:unselecting', function(e){
                     // get ship mass from selected ship type and update mass input field
                     let shipMass = e.params.data ? e.params.data.mass / 1000 : '';
diff --git a/public/js/v1.4.3/app/ui/module/connection_info.js b/public/js/v1.4.3/app/ui/module/connection_info.js
index 137dedd5..81172a10 100644
--- a/public/js/v1.4.3/app/ui/module/connection_info.js
+++ b/public/js/v1.4.3/app/ui/module/connection_info.js
@@ -718,7 +718,8 @@ define([
                                     if(currentUserData.character.log){
                                         logData.ship = {
                                             id: currentUserData.character.log.ship.typeId,
-                                            name: currentUserData.character.log.ship.typeName
+                                            name: currentUserData.character.log.ship.typeName,
+                                            mass: currentUserData.character.log.ship.mass
                                         };
                                     }
                                 }
@@ -1107,7 +1108,7 @@ define([
                 selectElementType.initUniverseTypeSelect({
                     categoryIds: [6],
                     maxSelectionLength: 1,
-                    selected: [Util.getObjVal(logData, 'ship.typeId')]
+                    selected: [Util.getObjVal(logData, 'ship.id')]
                 }).on('select2:select select2:unselecting', function(e){
                     // get ship mass from selected ship type and update mass input field
                     let shipMass = e.params.data ? e.params.data.mass / 1000 : '';
diff --git a/public/templates/ui/info_panel.html b/public/templates/ui/info_panel.html
index 98f04b7a..74361597 100644
--- a/public/templates/ui/info_panel.html
+++ b/public/templates/ui/info_panel.html
@@ -1,4 +1,4 @@
 <div id="{{id}}" class="alert alert-warning">
     <div class="ui-pnotify-icon"><span class="fas fa-exclamation fa-fw fa-lg"></span></div>
-    <h4 class="ui-pnotify-title">Scheduled maintenance: Update v1.4.1 <i class="fas fa-long-arrow-alt-right"></i> v1.4.2; Shutdown: ~17:45 (UTC). ETA ~18:00 (UTC)</h4>
+    <h4 class="ui-pnotify-title">Scheduled maintenance: Update v1.4.2 <i class="fas fa-long-arrow-alt-right"></i> v1.4.3; Shutdown: ~18:00 (UTC). ETA ~18:20 (UTC)</h4>
 </div>