django-restit 4.2.34__py3-none-any.whl → 4.2.36__py3-none-any.whl

account/models/member.py

@@ -494,24 +494,24 @@ class Member(User, RestModel, MetaDataModel):
         if notify:
             Member.notifyWithPermission("user_audit", subject, message=body, email_only=True)
 
-    def enable(self, by, memberships=None):
+    def enable(self, by, memberships=None, notify=True):
         if not self.is_active:
             self.is_active = True
             self.save()
-        # notify account disabled
-        subject = "MEMBER {} RE-ENABLED BY {}".format(self, by)
-        body = "enabled for: "
         if memberships is None:
             memberships = self.memberships.all()
-
         accounts = []
         for m in memberships:
             m.state = 10
             m.save()
             accounts.append(m.group.name)
-        body += "<br>\n".join(accounts)
         self.log("enabled", "account enabled by {}".format(by.username), method="enabled", level=35)
-        Member.notifyWithPermission("user_audit", subject, message=body, email_only=True)
+        if notify:
+            # notify account disabled
+            subject = f"MEMBER {self.username} RE-ENABLED BY {by.username}"
+            body = "enabled for: "
+            body += "<br>\n".join(accounts)
+            Member.notifyWithPermission("user_audit", subject, message=body, email_only=True)
 
     def locateByIP(self, ip):
         loc = GeoIP.get(ip)

account/rpc/group.py

@@ -59,6 +59,13 @@ def rest_on_group_invite(request, group_id=None):
     if ms is None:
         member.auditLog(f"added to {group.name}:{group.id} by {request.member.username}", "group_invite", level=21)
         ms = group.invite(member, request.DATA.get("role", "guest"))
+    elif not ms.is_enabled:
+        # re-enable the member if they are being re-invited after being disabled
+        if not ms.member.is_active:
+            # we need to make sure we only enable the user for this group
+            ms.member.enable(request.member, memberships=[], notify=False)
+        ms.set_state(0)
+        ms.save()
     ms.auditLog(f"invite sent by {request.member.username}", "invite", level=21)
     ms.sendInvite(request)
     return ms.restGet(request)

{django_restit-4.2.34.dist-info → django_restit-4.2.36.dist-info}/METADATA

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

{django_restit-4.2.34.dist-info → django_restit-4.2.36.dist-info}/RECORD

@@ -24,7 +24,7 @@ account/models/device.py,sha256=XipNpByreGubB5-d4ZBOoIV5Xw14b2Btcgn6fXz8HAc,4105
 account/models/feeds.py,sha256=FXqcZ1Qy4oYOLzai7-GL4WNd7iKPb5Y3ZqvKQunq1Yk,1861
 account/models/group.py,sha256=krFO_Q7kas6j36eYIVpOalLkNfWd1Mj4IniPgENJay4,20628
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=IC-z-ZDzSBh9EYr8rfvHguttbubBNTKp2vYrQz9nUBQ,50129
+account/models/member.py,sha256=XwT4evwN6_THL2bKb_TjtQg7NWNwQqtotMHLScplv1s,50188
 account/models/membership.py,sha256=K2fd0TJYhfv58HPyjQVlahlOPz3Q6ZwrxVkguG-2Ej8,7806
 account/models/notify.py,sha256=YnZujSHJHY7B09e6FIyZIEJRWLPYk1Sk1e92tFzB1IA,12078
 account/models/passkeys.py,sha256=TJxITUi4DT4_1tW2K7ZlOcRjJuMVl2NtKz7pKQU8-Tw,1516
@@ -38,7 +38,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=pr88ayqVUIBolR3FlWL0sb-JaH1PWH0ow39L7C6K6Rk,3466
+account/rpc/group.py,sha256=JFOTgAbxtpmNmJIMb9Gqesd4y_31Sv9G6atkRoNylqs,3802
 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
@@ -359,7 +359,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=S_WfIhIPQUOluFpyXFWGT_zK5Q-hZklAhRvPWuqNO8s,121
+rest/__init__.py,sha256=iVIqAE0As5bshnuxR1o0_pekm6J0wzokoNe-dvn7ps8,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/requestex.py,sha256=dYXDIg1TLu44FYFjR9X-6AAr7E5yeeGySrlEBC7ZOcU,15677
 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
-rest/serializers/collection.py,sha256=86AaICz8JylFUzhqouRpp_7v0cNzWcZpsW9yWZQ3w6Q,4648
+rest/serializers/collection.py,sha256=V9O4qxw26VX9dSYdbsN0-RNnXEi347Ln8eFLZ003LhA,4646
 rest/serializers/csv.py,sha256=MUMqGyAcKAtYblNiLMyeRKUr6kmthVEfAoM4iUTNvPA,3251
 rest/serializers/excel.py,sha256=KtxqZZU5Huzo31tyVVWbshMudeSAImKLO71ufQQt0-c,1077
 rest/serializers/json.py,sha256=R1has2PZQuXacA6WwfdrBnMG4rSM6CrnXQOhGoAU6Dk,1736
@@ -491,7 +491,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.34.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.34.dist-info/METADATA,sha256=_MJaPQPmu76cBOsqmwpe8OYoBA6nIsRqsmuUOdXRDEk,7594
-django_restit-4.2.34.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-django_restit-4.2.34.dist-info/RECORD,,
+django_restit-4.2.36.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.36.dist-info/METADATA,sha256=1PHMY2EOnFkwqFCIW8cEdj7UVpz_MukIYWjHR_T4NWI,7594
+django_restit-4.2.36.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+django_restit-4.2.36.dist-info/RECORD,,

rest/__init__.py

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

rest/serializers/collection.py

@@ -72,7 +72,7 @@ def to_list(qset, sort=None, size=25, start=0, fields=[], extra=[], exclude=[],
         qset, sort_args = sort_list(qset, sort)
         output["sort"] = sort_args
 
-    qset = qset[start:start+size+1]
+    qset = qset[start:start+size]
     if not fields:
         fields = ms.get_fields(qset)
     if settings.REST_SELECT_RELATED: