From e6bf8a81ac27384acd6666bf779a7550d4bf2432 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 12 Jun 2019 13:07:32 +0200 Subject: [PATCH] followup: network selector: refactor cidr6 merge logic Signed-off-by: Thomas Lamprecht --- form/NetworkSelector.js | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/form/NetworkSelector.js b/form/NetworkSelector.js index 2a94bbd..07192fc 100644 --- a/form/NetworkSelector.js +++ b/form/NetworkSelector.js @@ -68,23 +68,15 @@ Ext.define('Proxmox.form.NetworkSelector', { listeners: { load: function(store, records, successfull) { - if(successfull) { + if (successfull) { records.forEach(function(record) { - if(record.data.cidr && record.data.cidr6) { - var tempcopy = record.copy(null); - tempcopy.data.cidr = tempcopy.data.cidr6; - delete tempcopy.data.cidr6; - tempcopy.data.comment = tempcopy.data.comments6; - delete tempcopy.data.comments6; - store.add(tempcopy); - } - - if(!record.data.cidr && record.data.cidr6) { - record.data.cidr = record.data.cidr6; + if (record.data.cidr6) { + let dest = (record.data.cidr) ? record.copy(null) : record; + dest.data.cidr = record.data.cidr6; delete record.data.cidr6; - record.data.comments = record.data.comments6; + dest.data.comments = record.data.comments6; delete record.data.comments6; - store.add(record); + store.add(dest); } }); } -- 2.39.5