From 83762d5664714cb8a554d6028166364f4d37189d Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Sun, 27 Nov 2016 12:01:37 +0100 Subject: [PATCH] Fixed not parsing partially selected size values into invalid size strings. This fixes #2099 --- .../webroot/ngax/scripts/directives/parseAdvancedOption.js | 4 ++-- .../Server/webroot/ngax/scripts/directives/parseSizeNumber.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Duplicati/Server/webroot/ngax/scripts/directives/parseAdvancedOption.js b/Duplicati/Server/webroot/ngax/scripts/directives/parseAdvancedOption.js index fde2b57af..7e41f3835 100644 --- a/Duplicati/Server/webroot/ngax/scripts/directives/parseAdvancedOption.js +++ b/Duplicati/Server/webroot/ngax/scripts/directives/parseAdvancedOption.js @@ -179,7 +179,7 @@ backupApp.directive('parseAdvancedOptionSizeNumber', function(AppUtils) { if (name == null) return null; - return name + '=' + txt + multiplier; + return name + '=' + (txt || '0') + (multiplier || ''); }); ctrl[0].$formatters.push(function(src) { @@ -231,7 +231,7 @@ backupApp.directive('parseAdvancedOptionSizeMultiplier', function(AppUtils) { if (name == null) return null; - return name + '=' + (number || '') + txt; + return name + '=' + (number || '0') + (txt || ''); }); ctrl[0].$formatters.push(function(src) { diff --git a/Duplicati/Server/webroot/ngax/scripts/directives/parseSizeNumber.js b/Duplicati/Server/webroot/ngax/scripts/directives/parseSizeNumber.js index 05f6b7466..708a210f7 100644 --- a/Duplicati/Server/webroot/ngax/scripts/directives/parseSizeNumber.js +++ b/Duplicati/Server/webroot/ngax/scripts/directives/parseSizeNumber.js @@ -9,8 +9,7 @@ backupApp.directive('parseSizeNumber', function(AppUtils) { var multiplier = null; ctrl[0].$parsers.push(function(txt) { - txt = txt || '0'; - return txt + (multiplier || ''); + return (txt || '0') + (multiplier || ''); }); ctrl[0].$formatters.push(function(src) {