Merge branch 'fix_deleting_groups' into 'dev'

delete_rashetobj_fix

See merge request spatial/postamates!168

service/admin.py

@@ -12,7 +12,7 @@ from service.models import PlacementPoint
 from service.models import Rayon
 from service.models import PrePlacementPoint, Post_and_pvz, Post_and_pvzCategory, Post_and_pvzGroup, OtherObjects, \
     OtherObjectsGroup, \
-    OtherObjectsCategory, PrePlacementPointPVZDistance, TempFiles, RaschetGroups, House
+    OtherObjectsCategory, PrePlacementPointPVZDistance, TempFiles, RaschetGroups, House, RaschetObjects
 from service.models import PlacementPointPVZDistance, TaskStatus
 from postamates.settings import DEBUG
 from django.core.cache import cache
@@ -41,6 +41,10 @@ class Post_and_PVZAdmin(admin.ModelAdmin):
         LayerService().count_post_pvz_for_placementpoint(obj)
         RaschetGroups.objects.create(obj_id=obj.group.id)
 
+    def delete_model(self, request, obj):
+        RaschetObjects.objects.filter(obj_id=obj.id).delete()
+        super().delete_model(request, obj)
+
 
 my_admin_site.register(Post_and_pvz, Post_and_PVZAdmin)
 my_admin_site.register(OtherObjects)
@@ -100,6 +104,10 @@ class PostPvzGroupAdmin(GroupAdmin):
             LayerService.update_groups(obj)
         cache.clear()
 
+    def delete_model(self, request, obj):
+        RaschetGroups.objects.filter(obj_id=obj.id).delete()
+        super().delete_model(request, obj)
+
 
 class OtherObjectsGroupAdmin(GroupAdmin):
     def save_model(self, request, obj, form, change):
@@ -158,4 +166,4 @@ try:
 except NotRegistered:
     pass
 
-my_admin_site.register(User, UserAdmin)
+my_admin_site.register(User, UserAdmin)