Fixed QMs in Admin control panel &remv. OtherCave

core/TESTS/tests.py

@@ -45,7 +45,7 @@ class SimpleTest(SimpleTestCase):
         from django.template.defaultfilters import slugify
         from django.utils.timezone import get_current_timezone, make_aware
         from troggle.core.models import DataIssue, Expedition
-        from troggle.core.models_caves import Cave, OtherCaveName, LogbookEntry, PersonTrip
+        from troggle.core.models_caves import Cave, LogbookEntry, PersonTrip
         from parsers.people import GetPersonExpeditionNameLookup
     def test_import_core_views_caves(self):
         from django.http import HttpResponse, HttpResponseRedirect

core/admin.py

@@ -6,7 +6,7 @@ from django.core import serializers
 
 from troggle.core.views_other import downloadLogbook
 from troggle.core.models import Person, PersonExpedition, Expedition, DataIssue
-from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, OtherCaveName, LogbookEntry, PersonTrip, QM
+from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, LogbookEntry, PersonTrip, QM
 from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SingleScan
 
 
@@ -30,9 +30,9 @@ class SurvexBlockAdmin(TroggleModelAdmin):
     inlines = (RoleInline,)
 
 
-class OtherCaveInline(admin.TabularInline):
-    model = OtherCaveName
-    extra = 1
+# class OtherCaveInline(admin.TabularInline):
+    # model = OtherCaveName
+    # extra = 1
 
 
 class SurveyAdmin(TroggleModelAdmin):
@@ -98,7 +98,7 @@ class PersonExpeditionAdmin(TroggleModelAdmin):
 
 class CaveAdmin(TroggleModelAdmin):
     search_fields = ('official_name','kataster_number','unofficial_number')
-    inlines = (OtherCaveInline,)
+    #inlines = (OtherCaveInline,)
     extra = 4
 
 

core/models_caves.py

@@ -202,11 +202,11 @@ class Cave(TroggleModel):
                     pass
         return lowestareas[0]
 
-class OtherCaveName(TroggleModel):
-    name = models.CharField(max_length=160)
-    cave = models.ForeignKey(Cave,on_delete=models.CASCADE)
-    def __str__(self):
-        return str(self.name)
+# class OtherCaveName(TroggleModel):
+    # name = models.CharField(max_length=160)
+    # cave = models.ForeignKey(Cave,on_delete=models.CASCADE)
+    # def __str__(self):
+        # return str(self.name)
 
 class EntranceSlug(models.Model):
     entrance = models.ForeignKey('Entrance',on_delete=models.CASCADE)
@@ -503,7 +503,10 @@ class QM(TroggleModel):
         return "%s %s" % (self.code(), self.grade)
 
     def code(self):
-        return "%s-%s-%s" % (str(self.found_by.cave)[6:], self.found_by.date.year, self.number)
+        if self.found_by:
+            return "%s-%s-%s" % (str(self.found_by.cave)[6:], self.found_by.date.year, self.number)
+        else:
+            return "%s" % (self.number)
 
     def get_absolute_url(self):
         #return settings.URL_ROOT + '/cave/' + self.found_by.cave.kataster_number + '/' + str(self.found_by.date.year) + '-' + '%02d' %self.number