django-restit 4.2.133__tar.gz → 4.2.134__tar.gz

{django_restit-4.2.133 → django_restit-4.2.134}/PKG-INFO

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

{django_restit-4.2.133 → django_restit-4.2.134}/account/rpc/member.py

@@ -12,6 +12,18 @@ def rest_on_member(request, pk=None):
     return am.Member.on_rest_request(request, pk)
 
 
+@rd.urlPOST('member/motd/reset')
+@rd.perm_required('manage_members')
+def rest_on_clear_motd(request):
+    key = request.DATA.get("key")
+    if key.startswith("viewed."):
+        key = key.split('.')[-1]
+        am.MemberMetaData.objects.filter(key=key, category="viewed").delete()
+    else:
+        am.MemberMetaData.objects.filter(key="saw_motd", category__isnull=True).delete()
+    return restStatus(request, True)
+
+
 @rd.url(r'^member/me$')
 @rd.login_optional
 def member_me_action(request):

{django_restit-4.2.133 → django_restit-4.2.134}/auditlog/tq.py

@@ -10,10 +10,12 @@ from rest import settings
 
 AUDITLOG_PRUNE_DAYS = settings.get("AUDITLOG_PRUNE_DAYS", 90)
 REST_LOG_PRUNE_DAYS = settings.get("REST_LOG_PRUNE_DAYS", 90)
-ACCOUNT_LOG_PRUNE_DAYS = settings.get("ACCOUNT_LOG_PRUNE_DAYS", 360)
+ACCOUNT_LOG_PRUNE_DAYS = settings.get("ACCOUNT_LOG_PRUNE_DAYS", 640)
 ASYNC_LOG_PRUNE_DAYS = settings.get("ASYNC_LOG_PRUNE_DAYS", 14)
 SESSION_PRUNE_DAYS = settings.get("SESSION_PRUNE_DAYS", 180)
 
+ACCOUNT_LOG_COMPONENTS = settings.get("ACCOUNT_LOG_COMPONENTS", ["account.Member", "account.Group"])
+
 
 def on_cleanup(task):
     # cleanup log files in the var directory
@@ -41,21 +43,21 @@ def on_cleanup(task):
 def cleanupAuditLogs():
     if AUDITLOG_PRUNE_DAYS:
         before = datetime.now() - timedelta(days=AUDITLOG_PRUNE_DAYS)
-        return PersistentLog.objects.filter(when__lte=before).exclude(component__in=["account.Member", "account.Group"]).delete()[0]
+        return PersistentLog.objects.filter(when__lte=before).exclude(component__in=ACCOUNT_LOG_COMPONENTS).delete()[0]
     return 0
 
 
 def cleanupRestLogs():
     if REST_LOG_PRUNE_DAYS:
         before = datetime.now() - timedelta(days=REST_LOG_PRUNE_DAYS)
-        return PersistentLog.objects.filter(when__lte=before, component__in=["rest", "action"]).exclude(component__in=["account.Member", "account.Group"]).delete()[0]
+        return PersistentLog.objects.filter(when__lte=before, component__in=["rest", "action"]).exclude(component__in=ACCOUNT_LOG_COMPONENTS).delete()[0]
     return 0
 
 
 def cleanupAccountLogs():
     if ACCOUNT_LOG_PRUNE_DAYS:
         before = datetime.now() - timedelta(days=ACCOUNT_LOG_PRUNE_DAYS)
-        return PersistentLog.objects.filter(when__lte=before, component__in=["account.Member", "account.Group"]).delete()[0]
+        return PersistentLog.objects.filter(when__lte=before, component__in=ACCOUNT_LOG_COMPONENTS).delete()[0]
     return 0
 
 

{django_restit-4.2.133 → django_restit-4.2.134}/medialib/models.py

@@ -458,7 +458,10 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
         return f's3://{settings.AWS_S3_BUCKET}'
 
     def set_rendernow(self, value):
-        self.new_render()
+        if self.kind == "*":
+            self.saveState(200)
+            return
+        self.new_render(force_task=(self.kind == "V"))
 
     def uses(self):
         """
@@ -475,8 +478,8 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
     def async_render(self, files={}):
         return self.new_render()
 
-    def new_render(self, files={}):
-        if TASKQUEUE_RENDERING:
+    def new_render(self, files={}, force_task=False):
+        if TASKQUEUE_RENDERING or force_task:
             Task.Publish("medialib", "on_render", {"id": self.id, "name": self.name, "kind": self.kind}, channel="tq_app_handler_medialib")
         else:
             self.createRenditions()
@@ -556,8 +559,10 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
             self.kind = '*'
 
     def saveState(self, state):
-        self.state = state
-        return super(MediaItem, self).save()
+        if self.state != state:
+            self.state = state
+            return super(MediaItem, self).save()
+        return True
 
     def save(self, *args, **kwargs):
         if self.pk is None:

{django_restit-4.2.133 → django_restit-4.2.134}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.133"
+version = "4.2.134"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.133 → django_restit-4.2.134}/rest/__init__.py

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

{django_restit-4.2.133 → django_restit-4.2.134}/rest/models/base.py

@@ -881,6 +881,15 @@ class RestModel(object):
             response_params=dict(graph=graph),
             **cls.getGraph(graph))
 
+    @classmethod
+    def restListSort(cls, request, qset):
+        from rest.serializers.collection import sort_list
+        sort = request.DATA.get("sort", getattr(cls.RestMeta, "DEFAULT_SORT", "-id"))
+        sort = request.DATA.get("sort")
+        if sort:
+            qset, sort_args = sort_list(qset, sort)
+        return qset
+
     @classmethod
     def toList(cls, qset, graph=None, totals=None, request=None):
         if request is None:

{django_restit-4.2.133 → django_restit-4.2.134}/wiki/models/page.py

@@ -176,6 +176,8 @@ class Page(dm.Model, rm.RestModel, rm.MetaDataModel):
 
     @classmethod
     def on_rest_list_ready(cls, request, qset=None):
+        # need to first sort our list
+        qset = cls.restListSort(request, qset)
         out = []
         for page in qset:
             if page.on_rest_can_get(request):