From 3a08795a5ef531b087df41b34204ae8f3d98ffd0 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 16 Mar 2020 13:56:01 +0100 Subject: [PATCH] gui: ceph: let compare_ceph_versions accept arrays directly instead of always expecting a '.' separated version string we will use this for the 'structured' version data Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 92831a7c..bd2b161e 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -121,11 +121,24 @@ Ext.define('PVE.Utils', { utilities: { }, compare_ceph_versions: function(a, b) { + let avers = []; + let bvers = []; + if (a === b) { return 0; } - let avers = a.toString().split('.'); - let bvers = b.toString().split('.'); + + if (Ext.isArray(a)) { + avers = a.slice(); // copy array + } else { + avers = a.toString().split('.'); + } + + if (Ext.isArray(b)) { + bvers = b.slice(); // copy array + } else { + bvers = b.toString().split('.'); + } while (true) { let av = avers.shift();