From c3300f7c9685b89a8593640a73d74cc849b79428 Mon Sep 17 00:00:00 2001
From: expoonserver <devnull@localhost>
Date: Sun, 17 Jun 2018 02:24:00 +0100
Subject: [PATCH] FileUploadForm does not work with django 1.7. It tries to use
 database during class initialisation. removed it for now - not sure if it's
 important...

---
 core/forms.py       | 42 +++++++++++++++++++++---------------------
 core/views_other.py |  6 +++---
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/core/forms.py b/core/forms.py
index ae046b5..b091696 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -148,32 +148,32 @@ def get_name(pe):
             else:
                 return pe.person.first_name
 
-class UploadFileForm(forms.Form):
-    title = forms.CharField(max_length=50)
-    file  = forms.FileField()
-    html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30}))
-    lon_utm = forms.FloatField(required=False)
-    lat_utm = forms.FloatField(required=False)
-    slug = forms.CharField(max_length=50)
-    date = forms.DateField(required=False)
+#class UploadFileForm(forms.Form):
+#    title = forms.CharField(max_length=50)
+#    file  = forms.FileField()
+#    html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30}))
+#    lon_utm = forms.FloatField(required=False)
+#    lat_utm = forms.FloatField(required=False)
+#    slug = forms.CharField(max_length=50)
+#    date = forms.DateField(required=False)
 
-    caves = [cave.slug for cave in Cave.objects.all()]
-    caves.sort()
-    caves = ["-----"] + caves
-    cave = forms.ChoiceField([(c, c) for c in caves], required=False)
+#    caves = [cave.slug for cave in Cave.objects.all()]
+#    caves.sort()
+#    caves = ["-----"] + caves
+#    cave = forms.ChoiceField([(c, c) for c in caves], required=False)
 
-    entrance = forms.ChoiceField([("-----", "Please select a cave"), ], required=False) 
-    qm = forms.ChoiceField([("-----", "Please select a cave"), ], required=False) 
+#    entrance = forms.ChoiceField([("-----", "Please select a cave"), ], required=False) 
+#    qm = forms.ChoiceField([("-----", "Please select a cave"), ], required=False) 
 
-    expeditions = [e.year for e in Expedition.objects.all()]
-    expeditions.sort()
-    expeditions = ["-----"] + expeditions
-    expedition = forms.ChoiceField([(e, e) for e in expeditions], required=False)  
+#    expeditions = [e.year for e in Expedition.objects.all()]
+#    expeditions.sort()
+#    expeditions = ["-----"] + expeditions
+#    expedition = forms.ChoiceField([(e, e) for e in expeditions], required=False)  
 
-    logbookentry = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) 
+#    logbookentry = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) 
 
-    person = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) 
+#    person = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) 
     
-    survey_point = forms.CharField()
+#    survey_point = forms.CharField()
 
 
diff --git a/core/views_other.py b/core/views_other.py
index 67cd01a..f9a4661 100644
--- a/core/views_other.py
+++ b/core/views_other.py
@@ -1,5 +1,5 @@
 from troggle.core.models import Cave, Expedition, Person, LogbookEntry, PersonExpedition, PersonTrip, DPhoto, QM
-from troggle.core.forms import UploadFileForm
+#from troggle.core.forms import UploadFileForm
 from django.conf import settings
 from django import forms
 from django.template import loader, Context
@@ -259,8 +259,8 @@ def newFile(request, pslug = None):
 #                                                            "TU": py.time_underground, 
 #                                                            "author": py.is_logbook_entry_author}
 #                                                           for py in previouslbe.persontrip_set.all()])
-        else:        
-            fileform = UploadFileForm() # An unbound form
+#        else:        
+#            fileform = UploadFileForm() # An unbound form
 
     return render_with_context(request, 'editfile.html', {
         'fileForm': fileform,