Gitlab CSE Unil

Commit 03bb6268 authored by M. Chardon's avatar M. Chardon
Browse files

maj sur django 1.8

parent 8c95d529
......@@ -16,8 +16,6 @@ from jsonfield import JSONField
# from sorl.thumbnail import ImageField, get_thumbnail
from eav.models import BaseSchema, BaseAttribute, BaseChoice
from adim_utils.decorators import cache
# __all__ = ('AOType', 'AOSchema', 'AOChoice', 'AOAttribute', 'AnObj', 'AnObjMembership', 'EnvParam')
......@@ -121,11 +119,6 @@ class AnObj(models.Model):
_thumb_url = models.CharField(max_length=512, blank=True, null=True)
# ----- eav attributes
# ao_type = models.ForeignKey(AOType, verbose_name="type", blank=True, null=True)
# attrs = generic.GenericRelation(AOAttribute, object_id_field='entity_id',
# content_type_field='entity_type')
class Meta:
app_label = "adim"
verbose_name = "Annotable Object"
......
......@@ -47,8 +47,9 @@ MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware'
)
CACHES = {
......@@ -147,7 +148,7 @@ SESSION_COOKIE_NAME = "adim_sessid"
# ========== LOCAL APPS CONFIGURATION
#
LOCAL_APPS = ('django_extensions',)
LOCAL_APPS = ('django_extensions','eav')
# ..... MISC
SENDFILE_BACKEND = 'sendfile.backends.xsendfile'
......
......@@ -4,6 +4,7 @@ import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adim_project.settings")
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adim_project.settings.local")
#os.environ.setdefault('DJANGO_CONFIGURATION', 'Dev')
from django.core.management import execute_from_command_line
......
Django==1.7.7
Django==1.8.18
django-autoslug==1.7.2
django-jsonfield==0.9.13
django-sendfile==0.3.6
django-sendfile==0.3.11
django-split-settings==0.1.1
djangorestframework==2.4.4
djangorestframework==3.1.1
drf-nested-routers==0.9.0
eav-django==1.4.7
django-eav==0.9.4.post1
MySQL-python
Pillow==2.7.0
python-ldap==2.4.19
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment