Merge branch 'security' into testing
diff --git a/developer/migrations/__init__.py b/developer/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/developer/migrations/__init__.py
+++ /dev/null
diff --git a/exp_portal/migrations/__init__.py b/exp_portal/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/exp_portal/migrations/__init__.py
+++ /dev/null
diff --git a/op_tasks/models.py b/op_tasks/models.py
index 573cb05..af2dece 100755
--- a/op_tasks/models.py
+++ b/op_tasks/models.py
@@ -12,7 +12,7 @@
# the dataset class stores parameters about the
class Dataset(models.Model):
- name = models.CharField(max_length=1000) # name of dataset
+ name = models.CharField(max_length=255) # name of dataset
version = models.CharField(max_length=10)
is_active = models.BooleanField(default=True)
@@ -25,13 +25,13 @@
class Product(models.Model): # product = tool + dataset
dataset = models.ForeignKey(Dataset, null=True, blank=True) # data for tool
- url = models.CharField(max_length=1000, unique=True) # path to product
- team = models.CharField(max_length=1000) # developer team
- name = models.CharField(max_length=1000) # name of
+ url = models.CharField(max_length=255, unique=False) # path to product
+ #url = models.CharField(max_length=255, unique=False) # path to product
+ team = models.CharField(max_length=255) # developer team
+ name = models.CharField(max_length=255) # name of
version = models.CharField(max_length=10)
is_active = models.BooleanField(default=True)
- instructions = models.CharField(max_length=1000)
-
+ instructions = models.CharField(max_length=255)
def __unicode__(self): # Python 3: def __str__(self):
return '%s:%s:%s:%s' % (self.team, self.name, self.dataset, self.version)
@@ -39,10 +39,10 @@
class OpTask(models.Model):
dataset = models.ForeignKey(Dataset, null=True, blank=True)
name = models.CharField(max_length=200)
- survey_url = models.CharField(max_length=1000, unique=False)
+ survey_url = models.CharField(max_length=255, unique=False)
is_active = models.BooleanField(default=True)
- exit_url = models.CharField(max_length=1000, unique=False)
- instructions = models.CharField(max_length=1000)
+ exit_url = models.CharField(max_length=255, unique=False)
+ instructions = models.CharField(max_length=255)
def __unicode__(self): # Python 3: def __str__(self):
return '%s-%s' % (self.name, self.dataset)
diff --git a/op_tasks/views.py b/op_tasks/views.py
index 31c91c8..3d0a3e7 100755
--- a/op_tasks/views.py
+++ b/op_tasks/views.py
@@ -10,7 +10,6 @@
from django.utils import timezone
from elasticsearch import Elasticsearch
import achievements
-
import exp_portal
import datetime
diff --git a/xdata/settings.py b/xdata/settings.py
index 3af8155..fc3530d 100755
--- a/xdata/settings.py
+++ b/xdata/settings.py
@@ -48,7 +48,7 @@
'exp_portal',
'developer',
'uploads',
- 'axes',
+ 'axes', # Throttling capabilities
)
MIDDLEWARE_CLASSES = (
@@ -80,6 +80,15 @@
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, '../db', 'db.sqlite3'),
}
+
+ # 'default': {
+ # 'ENGINE': 'django.db.backends.mysql',
+ # 'NAME': 'xdatadb',
+ # 'USER': 'xdatauser',
+ # 'PASSWORD': 'Dr@perUs3r!',
+ # 'HOST': 'localhost', #'127.0.0.1', # Or an IP Address that your DB is hosted on
+ # 'PORT': '3306',
+ # }
}
