diff --git a/scripts/pip-requirement.txt b/scripts/pip-requirement.txt deleted file mode 100644 index 617685d43..000000000 --- a/scripts/pip-requirement.txt +++ /dev/null @@ -1 +0,0 @@ -pexpect == 3.3 \ No newline at end of file diff --git a/scripts/requirements.txt b/scripts/requirements.txt new file mode 100644 index 000000000..6a7e06134 --- /dev/null +++ b/scripts/requirements.txt @@ -0,0 +1,14 @@ +pexpect==3.3 +django-socketio==0.3.9 +gevent-socketio==0.2.1 +sphinx-me==0.3 +django==1.7.1 +gevent-websocket==0.9.3 +gevent==1.0.1 +greenlet==0.4.5 +python-ldap==2.4.18 +paramiko==1.15.1 +pycrypto==2.6.1 +ecdsa>=0.11 +MySQL-python==1.2.5 +python-ldap==2.4.18 diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py index c8123e3c2..bff9ead47 100644 --- a/webroot/AutoSa/AutoSa/views.py +++ b/webroot/AutoSa/AutoSa/views.py @@ -23,8 +23,6 @@ from AutoSa.settings import CONF_DIR from django.core.paginator import Paginator, InvalidPage, EmptyPage import time import datetime -from django_websocket import require_websocket -from django_websocket import accept_websocket cf = ConfigParser.ConfigParser() @@ -1004,25 +1002,8 @@ def killSession(request): return HttpResponse('ok') -@require_websocket -def echo(request): - f = open('/tmp/websocket.log') - message = f.read() - request.websocket.send(message) -@accept_websocket -def lower_case(request): - f = open('/tmp/websocket.log') - while True: - message = f.read() - request.websocket.send(message) - time.sleep(5) - - -def test_websocket(request): - return render_to_response('websocket.html') - diff --git a/webroot/AutoSa/UserManage/models.py b/webroot/AutoSa/UserManage/models.py index 6ccbdcbdd..a83dc991a 100644 --- a/webroot/AutoSa/UserManage/models.py +++ b/webroot/AutoSa/UserManage/models.py @@ -14,7 +14,7 @@ class User(models.Model): key_pass = models.CharField(max_length=100) name = models.CharField(max_length=50) group = models.ManyToManyField(Group) - is_admin = models.BooleanField() + is_admin = models.BooleanField(default=False) is_superuser = models.BooleanField() ldap_password = models.CharField(max_length=100, null=False) email = models.EmailField(max_length=50, null=True, blank=True) diff --git a/webroot/AutoSa/templates/websocket.html b/webroot/AutoSa/templates/websocket.html deleted file mode 100644 index 252ad848e..000000000 --- a/webroot/AutoSa/templates/websocket.html +++ /dev/null @@ -1,28 +0,0 @@ - - -WebSocket Test - -

WebSocket Test

-
\ No newline at end of file