Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge branch 'security' into testing
  • Loading branch information
dtraviglia committed Nov 5, 2015
2 parents 1db2b60 + 1460cc3 commit 23ab7ffd3b15b7e9d442efd68ec578dd9d352a89
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 11 deletions.
Empty file.
Empty file.
@@ -12,7 +12,7 @@ def _createHash():

# 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,24 +25,24 @@ class Meta:

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)


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)
@@ -10,7 +10,6 @@
from django.utils import timezone
from elasticsearch import Elasticsearch
import achievements

import exp_portal
import datetime

@@ -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',
# }
}


0 comments on commit 23ab7ff

Please sign in to comment.