From 8b8f9793b776b4e192087a9cc78acc557f0c253c Mon Sep 17 00:00:00 2001
From: bdzim <benjamin.zimmerman@gmail.com>
Date: Wed, 12 Sep 2018 09:39:51 -0400
Subject: [PATCH] remove ip blocks (#312)

---
 .../partials/add-ip-blocks-widget.html        | 91 -------------------
 .../blue_mgnt/templates/settings.html         |  4 -
 .../blue_mgnt/views/settings.py               | 26 ------
 3 files changed, 121 deletions(-)
 delete mode 100644 django/apps/blue_management/blue_mgnt/templates/partials/add-ip-blocks-widget.html

diff --git a/django/apps/blue_management/blue_mgnt/templates/partials/add-ip-blocks-widget.html b/django/apps/blue_management/blue_mgnt/templates/partials/add-ip-blocks-widget.html
deleted file mode 100644
index 041ac1c..0000000
--- a/django/apps/blue_management/blue_mgnt/templates/partials/add-ip-blocks-widget.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<div class="modal-wrapper">
-{% if not private_cloud %}
-<div class="modal-content">
-<form method="post" action="{% url 'blue_mgnt:settings' %}">
-    {% csrf_token %}
-    {{ ip_blocks.management_form }}
-    <h2 class="page-header"><i class="ss-icon">&#x1F464;</i>CSR Netblocks
-        <span class="actions"><i class="ss-icon">&#x2421;</i></span>
-    </h2>
-        <div class="spacer"><!--ZXP--></div>
-    <div class="ip_input">
-    <table id="ip_blocks" class="widget-table">
-        <thead>
-            <tr>
-                <th>IP Block</th>
-                <th>Delete IP Block</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for form in ip_blocks.forms %}
-            <tr>
-                {% for field in form.visible_fields %}
-                <td>
-                    {% if forloop.first %}
-                        {% for hidden in form.hidden_fields %}
-                            {{ hidden }}
-                        {% endfor %}
-                    {% endif %}
-                    {% if field.errors %}
-                        {% for error in field.errors %}
-                        <span class="error-highlight">
-                            {{ field }}
-                            <span class="error-tag">{{ error }}</span>
-                        </span>
-                        {% endfor %}
-                    {% else %}
-                        {{ field }}
-                    {% endif %}
-                </td>
-                {% endfor %}
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-    <input type='hidden' value='ip_block' name='form'>
-    <div class="widget-actions">
-        <input type="button" value="Add IP Block" id="add_ip_block" class="button button-muted">
-        {% if perms.blue_mgnt.can_manage_settings %}
-        <input type='submit' value="Save Changes" class="rhs button button-primary-basic">
-        {% endif %}
-    </div>
-    </div>
-</div>
-</form>
-</div>
-{% endif %}
-</div>
-{% block extrajs %}
-<script src="/static/blue_common/scripts/jquery.form.js"></script>
-<script type="text/javascript"> 
-    var error = {{ error|yesno:'true, false' }};
-var empty_ip_block_form = '';
-function update_form(new_form, total){
-    new_form.find(':input').each(function() {
-        var name = $(this).attr('name').replace('-' + (total-1) + '-','-' + total + '-');
-        var id = 'id_' + name;
-        $(this).attr({'name': name, 'id': id});
-    });
-}
-
-function add_ip_block_form(){
-    var new_form = empty_ip_block_form.clone(true);
-    var total = parseInt($('#id_ip_blocks-TOTAL_FORMS').val());
-    update_form(new_form, total);
-    $('#id_ip_blocks-TOTAL_FORMS').val(1 + total);
-    $('#ip_blocks > tbody').append(new_form);
-}
-
-$(function(){
-    empty_ip_block_form = $('#ip_blocks > tbody > tr:last').clone();
-    if(!error){
-        $('#ip_blocks > tbody > tr:last').remove();
-        $('#id_ip_blocks-TOTAL_FORMS').val($('#id_ip_blocks-TOTAL_FORMS').val() - 1);
-    }else{
-        empty_ip_block_form.clearForm();
-        $('ul', empty_ip_block_form).remove()
-    }
-    $('#add_ip_block').click(add_ip_block_form);
-});
-</script>
-{% endblock extrajs %}
diff --git a/django/apps/blue_management/blue_mgnt/templates/settings.html b/django/apps/blue_management/blue_mgnt/templates/settings.html
index 0800004..2c06324 100644
--- a/django/apps/blue_management/blue_mgnt/templates/settings.html
+++ b/django/apps/blue_management/blue_mgnt/templates/settings.html
@@ -3,7 +3,6 @@
 {% block body_classes %}settings {{ block.super }}{% endblock body_classes %}
 {% block breadcrumb %}<a href="{% url 'blue_mgnt:manage' %}">Back to Manage</a>{% endblock breadcrumb %}
 {% block modal_options %}
-    {% include "partials/add-ip-blocks-widget.html" with active="manage" %}
     {% include "partials/reboot-widget.html" %}    
 {% endblock modal_options %}
 {% block navtab %}{% include "partials/navtab-widget.html" with active="manage" %}{% endblock navtab %}
@@ -24,9 +23,6 @@ <h2 class="page-header"><i class="ss-icon">&#x2699;</i>Status
 <!-- Settings -->
 <h1 class="page-header">
 	<i class="ss-icon">&#x1F464;</i> Accounts
-    <div class="actions">
-		<button id="add-widget" class="button button-primary-basic">Add IP Blocks</button>
-	</div>
 </h1>
 <div class="spacer"></div>
 {% if saved %}
diff --git a/django/apps/blue_management/blue_mgnt/views/settings.py b/django/apps/blue_management/blue_mgnt/views/settings.py
index 96a9fe8..c7b93c1 100644
--- a/django/apps/blue_management/blue_mgnt/views/settings.py
+++ b/django/apps/blue_management/blue_mgnt/views/settings.py
@@ -76,18 +76,6 @@ def save_settings(request, api, options):
         subprocess.call(['timedatectl', 'set-timezone', cleaned_data['timezone']])
 
 
-class IPBlockForm(forms.Form):
-    ip_block = forms.CharField(max_length=43, label='IP Block:')
-
-    def clean_ip_block(self):
-        data = self.cleaned_data['ip_block']
-        try:
-            ip = IP(data)  # NOQA
-        except ValueError:
-            raise forms.ValidationError('Invalid IP Block')
-        return data
-
-
 def login_test(config, username, password):
     if username:
         if account_mgr.authenticator(config, username, password, False):
@@ -192,23 +180,10 @@ def clean(self):
             api.update_enterprise_settings(dict(signup_network_restriction=blocks))
             log_admin_action(request, 'update signup network restrictions: %s' % blocks)
 
-    IPBlockFormSet = formset_factory(IPBlockForm,
-                                     can_delete=True,
-                                     formset=BaseIPBlockFormSet)
-
-    ip_blocks = IPBlockFormSet(initial=[dict(ip_block=x) for x in
-                                        opts['signup_network_restriction']],
-                               prefix='ip_blocks')
     error = False
     command_output = ''
 
     if request.method == 'POST' and request.user.has_perm('blue_mgnt.can_manage_settings'):
-        if request.POST.get('form', '') == 'ip_block':
-            ip_blocks = IPBlockFormSet(request.POST, prefix='ip_blocks')
-            if ip_blocks.is_valid():
-                return redirect('blue_mgnt:settings_saved')
-            else:
-                error = True
         elif request.POST.get('form', '') == 'reboot':
             log_admin_action(request, 'reboot management vm')
             subprocess.call(['shutdown', '-r', 'now'])
@@ -253,7 +228,6 @@ def clean(self):
         user=request.user,
         username=username,
         features=features,
-        ip_blocks=ip_blocks,
         command_output=command_output,
         options=options,
         saved=saved,