fix media upload dir, remove notes

diff --git a/app/settings.py b/app/settings.py
index 0ef15a1606423891aa9115bc23163475bc045e60..cbcce9ff5b78a30ea14abb2acfaaad6e4a02f88d 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -140,7 +140,7 @@ INSTALLED_APPS = (
     'postman',
 #    'private_files',
     #'markup_mixin',
-    'notes',
+    #'notes',
 #    'jquery',
     'timezones',
     'jqchat',
@@ -197,6 +197,8 @@ TELEFORMA_EXAM_MAX_SESSIONS = 15
 TELEFORMA_EXAM_SCRIPT_MAX_SIZE = 20480000
 TELEFORMA_EXAM_SCRIPT_SERVICE_URL = '/webviewer/teleforma.html'
 
+FILE_UPLOAD_TEMP_DIR = '/srv/media/tmp'
+
 TELECASTER_LIVE_STREAMING_SERVER = 'stream.parisson.com'
 TELECASTER_LIVE_STREAMING_PORT = 443
 

diff --git a/teleforma/forms.py b/teleforma/forms.py
index 2e25878a4fcc24f0bd1726504feffeb053b9e1f3..4c53cab89db4b849f3670173b42294fd2e659378 100644 (file)
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -17,6 +17,7 @@ class ConferenceForm(ModelForm):
 
     class Meta:
         model = Conference
+        exclude = []
 
 
 class UserForm(ModelForm):
@@ -129,4 +130,4 @@ class WriteForm(PostmanWriteForm):
             course.save()
             recipients = [professor.user,]
 
-        return recipients
\ No newline at end of file
+        return recipients