diff --git a/.gitignore b/.gitignore index 8874f344..0f518a83 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ GloboNetworkAPI-client-python/* .project/ venv/ config/*.env -CadVlan/static \ No newline at end of file +CadVlan/static +*.env \ No newline at end of file diff --git a/CadVlan/VipRequest/facade.py b/CadVlan/VipRequest/facade.py index f9bea40b..b6c55738 100644 --- a/CadVlan/VipRequest/facade.py +++ b/CadVlan/VipRequest/facade.py @@ -180,6 +180,9 @@ def popular_client_shared(request, client_api): lists['clients'] = client_evip.environmentvip_step(finality) + for item in lists['clients']: + item['disabled'] = True if finality == 'Producao' and item['cliente_txt'] == 'VPN' else False + except NetworkAPIClientError, e: logger.error(e) messages.add_message(request, messages.ERROR, e) diff --git a/CadVlan/templates/ajax/request-vip-client.html b/CadVlan/templates/ajax/request-vip-client.html index ca332bb1..9486f4e4 100644 --- a/CadVlan/templates/ajax/request-vip-client.html +++ b/CadVlan/templates/ajax/request-vip-client.html @@ -15,5 +15,9 @@ limitations under the License. --> {% for client in clients %} - + {% if client.disabled %} + + {% else %} + + {% endif %} {% endfor %} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 4d2bf362..997f1a1e 100755 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ python-ldap==2.3.13 python-memcached==1.48 gunicorn==19.8.1 PyYAML +#pyyaml==5.3.1 #If you have problem with PyYaml, try this \ No newline at end of file diff --git a/scripts/docker/docker-start-debug.sh b/scripts/docker/docker-start-debug.sh index 8ab7990c..c92567e7 100755 --- a/scripts/docker/docker-start-debug.sh +++ b/scripts/docker/docker-start-debug.sh @@ -43,4 +43,4 @@ echo "starting runserver 0.0.0.0:8080" rm -rf CadVlan/static python manage.py collectstatic --settings=CadVlan.settings --noinput -python manage.py runserver 0.0.0.0:8080 > /tmp/cadvlan.log 2>&1 +python manage.py runserver 0.0.0.0:8080