diff --git a/api/views.py b/api/views.py index 82dca93..b721b52 100644 --- a/api/views.py +++ b/api/views.py @@ -70,7 +70,14 @@ def freeSubnet(request): prefixLen = 0 try: - prefixLen = int(request.GET.get("prefixLen", 27)) + prefixLen = request.GET.get("prefixLen", None) + if not prefixLen: + if parentRange.protocol == InetNum.IPv4: + prefixLen = 27 + else: + prefixLen = 60 + prefixLen = int(prefixLen) + if prefixLen < 8 or \ (parentRange.protocol == InetNum.IPv4 and prefixLen > 32) or \ (parentRange.protocol == InetNum.IPv6 and prefixLen > 128): diff --git a/templates/whoisdb/create_js.html b/templates/whoisdb/create_js.html index 133fb30..44f2006 100644 --- a/templates/whoisdb/create_js.html +++ b/templates/whoisdb/create_js.html @@ -40,7 +40,7 @@ function findPrefix(size, step) { var parentRangeOpt = $('#id_'+ef+'parent_range option:selected'); if(parentRangeOpt.val()) { - var prefixLen = 27; + var prefixLen = null; var m = netInpText.match("([0-9.:]+/)?(\\d+)"); console.log(prefixLen) console.log(netInpText); @@ -69,8 +69,8 @@ $(document).ready(function() { console.log("NOOT NOOT"); $('#div_id_number label').append(' (next free number)'); $('#div_id_0-number label').append(' (next free number)'); - $('#div_id_prefix label').append(' (next free /27)'); - $('#div_id_1-prefix label').append(' (next free /27)'); + $('#div_id_prefix label').append(' (next free /27 or /60)'); + $('#div_id_1-prefix label').append(' (next free /27 or /60)'); }); diff --git a/templates/whoisdb/create_overview.html b/templates/whoisdb/create_overview.html index fde5065..2691eb8 100644 --- a/templates/whoisdb/create_overview.html +++ b/templates/whoisdb/create_overview.html @@ -11,7 +11,7 @@

Create Database Objects