From e2889616cb0e2b01243f15b49d0caf4cdf06e7fd Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Mon, 18 May 2020 15:15:24 +0000 Subject: [PATCH 1/2] Merge branch 'noc-1299' into 'master' #1299 Hide hidden custom fields from ipam view See merge request noc/noc!3626 (cherry picked from commit 72d0ea87ebbab0b56d4e75af28c0a51a3a8076d0) 5fa75fcd #1299 Hide hidden custom fields from ipam view --- services/web/apps/ip/ipam/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/web/apps/ip/ipam/views.py b/services/web/apps/ip/ipam/views.py index e7a6c5d6bf..6acee54fec 100644 --- a/services/web/apps/ip/ipam/views.py +++ b/services/web/apps/ip/ipam/views.py @@ -196,6 +196,8 @@ class IPAMApplication(ExtApplication): # # Add custom fields for f in CustomField.table_fields("ip_prefix"): + if f.is_hidden: + continue v = getattr(prefix, f.name) prefix_info += [(f.label, v if v is not None else "")] # Ranges -- GitLab From 6c3153ebcd7a4fa1c73228967c4100e322ff8a38 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 22 May 2020 11:36:30 +0500 Subject: [PATCH 2/2] Fix flake. --- services/web/apps/ip/ipam/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/apps/ip/ipam/views.py b/services/web/apps/ip/ipam/views.py index 6acee54fec..818a4ba204 100644 --- a/services/web/apps/ip/ipam/views.py +++ b/services/web/apps/ip/ipam/views.py @@ -252,8 +252,8 @@ class IPAMApplication(ExtApplication): for e in entering: slots[r_slots[e]] = e r[2] = slots[:] - for l in leaving: - slots[r_slots[l]] = None + for ll in leaving: + slots[r_slots[ll]] = None # Assign slots to addresses c = [None] * max_slots rrs = rs[:] -- GitLab