django-restit 4.2.55__py3-none-any.whl → 4.2.57__py3-none-any.whl

account/models/group.py

@@ -448,6 +448,7 @@ class Group(models.Model, RestModel, MetaDataModel):
         if ms is None:
             ms = Membership(member=member, group=self, role=role)
             ms.save()
+            ms.on_rest_created(self.getActiveRequest())
         elif ms.role != role:
             ms.clearPermissions()
         if not ms.is_enabled:

account/models/membership.py

@@ -127,6 +127,7 @@ class Membership(models.Model, RestModel, MetaDataModel):
                 msg = F"{self.member.username} access to {self.group.name} disabled by {by_user}"
                 self.auditLog(msg, "membership_disabled")
                 self.member.auditLog(msg, "membership_disabled")
+                self.group.auditLog(msg, "membership_disabled")
                 self.state = value
             elif self.state < -10 and value >= -10:
                 request = self.getActiveRequest()
@@ -137,6 +138,7 @@ class Membership(models.Model, RestModel, MetaDataModel):
                 msg = F"{self.member.username} access to {self.group.name} enabled by {by_user}"
                 self.auditLog(msg, "membership_enabled")
                 self.member.auditLog(msg, "membership_enabled")
+                self.group.auditLog(msg, "membership_enabled")
                 self.state = value
             else:
                 self.state = value
@@ -196,6 +198,28 @@ class Membership(models.Model, RestModel, MetaDataModel):
             for k in value:
                 self.addPermission(k)
 
+    def on_rest_deleted(self, request):
+        # called right before the delete
+        msg = f"{self.member.username} membership deleted for {self.group.name}:{self.group.pk} by {request.member.username}"
+        self.member.auditLog(msg, "membership_deleted")
+        self.group.auditLog(msg, "membership_deleted")
+        # request.member(msg, "deleted_membership")
+        # check if we should delete children
+        if request.DATA.get("delete_children", False, field_type=bool):
+            groups = self.group.getAllChildren(False, True, True)
+            for g in groups:
+                for ms in g.memberships.filter(member=self.member):
+                    msg = f"{self.member.username} membership deleted for {ms.group.name}:{ms.group.pk} by {request.member.username}"
+                    ms.member.auditLog(msg, "membership_deleted")
+                    ms.group.auditLog(msg, "membership_deleted")
+                    # request.member(msg, "deleted_membership")
+                    ms.delete()
+
+    def on_rest_created(self, request):
+        msg = f"{self.member.username} membership added for {self.group.name}:{self.group.pk} by {request.member.username}"
+        self.member.auditLog(msg, "membership_added")
+        self.group.auditLog(msg, "membership_added")
+
     def __str__(self):
         return F"{self.group}:{self.member}:{self.id}"
 

account/rpc/group.py

@@ -83,8 +83,13 @@ def rest_on_membership(request, pk=None):
 @rd.login_required
 def rest_on_users_membership(request, group_id=None):
     ms = request.member.getMembershipFor(group_id, include_parents=True)
-    if ms is None or not ms.is_enabled:
+    if ms is None:
         return rv.restStatus(request, False, error="not found", error_code=404)
+    if not ms.is_enabled:
+        return rv.restPermissionDenied(
+            request,
+            error=f"membership({request.member.username}) has been disabled for this group({group_id})",
+            error_code=410)
     return ms.restGet(request)
 
 

{django_restit-4.2.55.dist-info → django_restit-4.2.57.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.55
+Version: 4.2.57
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.55.dist-info → django_restit-4.2.57.dist-info}/RECORD

@@ -23,10 +23,10 @@ account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
 account/models/device.py,sha256=XipNpByreGubB5-d4ZBOoIV5Xw14b2Btcgn6fXz8HAc,4105
 account/models/feeds.py,sha256=FXqcZ1Qy4oYOLzai7-GL4WNd7iKPb5Y3ZqvKQunq1Yk,1861
-account/models/group.py,sha256=_YqEuy9oJ2VL7ocsJO1mEWA_hYl_1MylHJsLezj-dCM,21520
+account/models/group.py,sha256=4fk-RavG1wNVzfuXMaD2XDiX2DhK1hgL0-OA54Uym18,21576
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
 account/models/member.py,sha256=CxxhNnFCQPEw7MGc5147J8eandYqUj6HhhQ_YRyFQX4,50397
-account/models/membership.py,sha256=K2fd0TJYhfv58HPyjQVlahlOPz3Q6ZwrxVkguG-2Ej8,7806
+account/models/membership.py,sha256=GJ6bSFLfU1CN9466k0XjSwn1sQIEwFeC8-oUYd2MrSs,9217
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/passkeys.py,sha256=TJxITUi4DT4_1tW2K7ZlOcRjJuMVl2NtKz7pKQU8-Tw,1516
 account/models/session.py,sha256=o3t98e8itXEtkknBHdBH_PSq9kuw1A858_wl6ZleXMM,3729
@@ -39,7 +39,7 @@ account/periodic.py,sha256=-u0n-7QTJgDOkasGhBAPwHAwjpqWGA-MZLEFkVTqCGU,874
 account/rpc/__init__.py,sha256=SGF0M_-H0dKh3b1apSX29BotNWAvITYccGQVC0MIjL8,336
 account/rpc/auth.py,sha256=eywdJSjsi_Ds2pM4wnltPJUfjIQqf6r6e99eKS7q3BA,15593
 account/rpc/device.py,sha256=fbbZFp3cUdhVXvD7gVFOqFWj4hKS3bjZKD_aF5fQxd8,2852
-account/rpc/group.py,sha256=eW5p0TbJC7b77Xf7CTqLm-Qq_r1FPbGmSuVWrQR37uA,3823
+account/rpc/group.py,sha256=FD9GymgPY68y-gtDLsZxYVdwQJeLGpqcP4hjcDUh-GM,4022
 account/rpc/member.py,sha256=PU-Uz5KUI_BZFy-F-taDqAfnt_AwONYXSzUvfm7eyTw,1264
 account/rpc/notify.py,sha256=Q2YWejP36egeF060Hih5uX4Psv_B8NWlLLPi7iDYlIw,3344
 account/rpc/oauth.py,sha256=ISLVsR5HvKALANokaOFRvF4FTRxWtXPvVnZAYANKxpo,2864
@@ -115,7 +115,7 @@ incident/rpc.py,sha256=D7cAPkW94F6ISlCTQ74GxnbLId-I3bMK4Xss0GoHM9w,7934
 incident/templates/email/incident_change.html,sha256=O_5ocWTsnqmmOuQhAtXEiE4rWecnZnJjoKU4MwV6ILo,14178
 incident/templates/email/incident_new.html,sha256=IPX3CqIrvdrZSn13_jlR6sEb0If8ftvUrUpkzC5G2Gc,15173
 incident/templates/email/incident_plain.html,sha256=fx4zsoldG1AQEBA6IYx5BJp_MAMizgjjx9EmuR5m4SQ,14727
-incident/tq.py,sha256=6GGGVKzcbslDBz0oDyBSKdFCLYWKYiVkUeOEiHOOfcM,5049
+incident/tq.py,sha256=6KjeTFlWAlG_l8LWMlxUGdr8ULU0uE-DB5ex0ERW440,5226
 location/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 location/admin.py,sha256=6S97Rlgjkk0jM15sbT1OJRPZbgvKn2rn7duCSazOXq4,297
 location/geolocate.py,sha256=UgV129vmSxnqYFBYJD2RQVOcC1-lJJ1zUaxDqOJRbG4,1694
@@ -363,7 +363,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=BY-YEPw34b05E2wiNFO7v_F-Vh5mJ1Z0zGzfayCfGqw,121
+rest/__init__.py,sha256=lgq1gaLUtdHmzwhYr6xVWzn6uiT3N9nuvNfIXqQte5I,121
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -400,7 +400,7 @@ rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=65GvfFbc26_7wJz8qEAzU7fEOZWVz0ttO5j5m_gs4hk,12860
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
-rest/requestex.py,sha256=KxPqfCe5Gll-8I3Onk_ESgsuJEkWILspJDA_4EwJcEY,16017
+rest/requestex.py,sha256=N56056vV3zWkAP-QrYsCu7SdpPzE5kLuPoxGIuZAKt0,16127
 rest/rpc.py,sha256=Z-0Q62VeMViZiS_9vBHKJmbERgemsfg8pnKFjV-DH-w,4200
 rest/search.py,sha256=QVjk2b5tZLgf1zM2MHvJTyRjwUbY5ZD7HXSTmSPXtvU,8362
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -496,7 +496,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.55.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.55.dist-info/METADATA,sha256=iNmXS4_QBBaTCt1EqlW6NdGnnwn-_TM29PBHRPOdZDo,7594
-django_restit-4.2.55.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.55.dist-info/RECORD,,
+django_restit-4.2.57.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.57.dist-info/METADATA,sha256=sxDTnjHMcR9ergS9eCqSS4XCX_DzPUO7UnhI9OirFTs,7594
+django_restit-4.2.57.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.57.dist-info/RECORD,,

incident/tq.py

@@ -126,6 +126,10 @@ def run_cleanup(task):
         Q(incident__state=ia.INCIDENT_STATE_IGNORE) | Q(incident__isnull=True)).delete()
     if count:
         task.log(f"deleted {count} old Events")
+    
+    count = ia.Incident.objects.filter(created__lte=stale).filter(state=ia.INCIDENT_STATE_IGNORE).delete()
+    if count:
+        task.log(f"deleted {count} old Incidents")
 
     count = GeoIP.removeDuplicates()
     if count:

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.55"
+__version__ = "4.2.57"

rest/requestex.py

@@ -84,7 +84,10 @@ class RequestData(object):
         elif self.request.method == "GET":
             data = self.request.GET
         elif self.request.method == "DELETE":
-            data = dict()
+            if self.request.body:
+                data = QueryDict(self.request.body)
+            else:
+                data = objict()
         elif self.request.method == "PUT":
             if self.request.content_type == "application/json":
                 data = UberDict.fromJSON(self.request.body, ignore_errors=True)