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

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

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

{django_restit-4.2.133 → django_restit-4.2.135}/account/models/group.py

@@ -132,14 +132,20 @@ class Group(models.Model, RestModel, MetaDataModel):
             ]
         }
 
+    _tz_long = None
+    _tz_short = None
+
     @property
     def timezone(self):
-        return self.getProperty("timezone", "America/Los_Angeles")
+        if self._tz_long is None:
+            self._tz_long = self.getParentProperty("timezone", "America/Los_Angeles")
+        return self._tz_long
 
     @property
     def timezone_short(self):
-        zone = self.getProperty("timezone", "America/Los_Angeles")
-        return rh.getShortTZ(zone)
+        if self._tz_short is None:
+            self._tz_short = rh.getShortTZ(self.timezone)
+        return self._tz_short
 
     @property
     def file_safe_name(self):
@@ -234,6 +240,8 @@ class Group(models.Model, RestModel, MetaDataModel):
 
     def set_timezone(self, value):
         if self.pk:
+            self._tz_long = None
+            self._tz_short = None
             self.setProperty("timezone", value)
 
     def getChildModels(self, Model, grand_children=False, great_grand_children=False):
@@ -341,32 +349,43 @@ class Group(models.Model, RestModel, MetaDataModel):
                 return True
         return False
 
+    def getParentProperty(self, key, default=None, category=None, field_type=None, decrypted=False):
+        val = self.getProperty(key, rh.UNKNOWN, category, field_type, decrypted)
+        if val != rh.UNKNOWN:
+            return val
+        if self.parent:
+            val = self.parent.getProperty(key, rh.UNKNOWN, category, field_type, decrypted)
+            if val != rh.UNKNOWN:
+                return val
+            return self.parent.getParentProperty(key, default, category, field_type, decrypted)
+        return default
+
     def getLocalTime(self, when=None, tz_aware=False):
-        zone = self.getProperty("timezone", "America/Los_Angeles")
+        zone = self.getParentProperty("timezone", "America/Los_Angeles")
         return rh.convertToLocalTime(zone, when, tz_aware)
 
     def getUTC(self, when):
-        zone = self.getProperty("timezone", "America/Los_Angeles")
+        zone = self.getParentProperty("timezone", "America/Los_Angeles")
         return rh.convertToUTC(zone, when)
 
     def getBusinessDay(self, start=None, end=None, kind="day"):
-        zone = self.getProperty("timezone", "America/Los_Angeles")
-        eod = self.getProperty("eod", 0, field_type=int)
+        zone = self.getParentProperty("timezone", "America/Los_Angeles")
+        eod = self.getParentProperty("eod", 0, field_type=int)
         return rh.getDateRange(start, end, kind, zone, hour=eod)
 
     def getOperatingHours(self, start=None, end=None, kind="day"):
         # deprecate this, operating hours is deceptive
-        zone = self.getProperty("timezone", "America/Los_Angeles")
-        eod = self.getProperty("eod", 0, field_type=int)
+        zone = self.getParentProperty("timezone", "America/Los_Angeles")
+        eod = self.getParentProperty("eod", 0, field_type=int)
         return rh.getDateRange(start, end, kind, zone, hour=eod)
 
     def getTimeZoneOffset(self, when=None, hour=None):
-        zone = self.getProperty("timezone", "America/Los_Angeles")
+        zone = self.getParentProperty("timezone", "America/Los_Angeles")
         return rh.getTimeZoneOffset(zone, when, hour=hour)
 
     def getEOD(self, eod=None, onday=None, in_local=False):
         if eod is None:
-            eod = self.getProperty("eod", 0, field_type=int)
+            eod = self.getParentProperty("eod", 0, field_type=int)
             if in_local:
                 return eod
         offset = self.getTimeZoneOffset(onday, hour=eod)

{django_restit-4.2.133 → django_restit-4.2.135}/account/models/member.py

@@ -589,14 +589,18 @@ class Member(User, RestModel, MetaDataModel):
             email_only=True, attachments=attachments)
 
     def sendInvite(self, subject, group=None, url=None, msg=None, **kwargs):
-        if url is None:
-            url = settings.DEFAULT_LOGIN_URL
+        if url is None and group is not None:
+            url = group.getParentProperty("default_portal")
+            if url is None:
+                url = settings.DEFAULT_LOGIN_URL
         if url[:4] != "http":
             url = f"https://{url}"
         from_domain = rh.parseHostName(url, True)
         from_email = rh.getFromEmailForHost(from_domain)
+        portal_domain = rh.parseHostName(url, False)
         self.member.setProperty("default_domain", from_domain)
         self.member.setProperty("default_from_email", from_email)
+        self.member.setProperty("default_portal", portal_domain)
         context = rh.getContext(
             self.getActiveRequest(),
             member=self,

{django_restit-4.2.133 → django_restit-4.2.135}/account/models/notify.py

@@ -10,6 +10,7 @@ from .member import Member
 
 from datetime import datetime, timedelta
 import threading
+import incident
 
 
 def sendEmail(email_to, subject, body=None, attachments=[], 
@@ -110,6 +111,14 @@ class NotificationRecord(models.Model, RestModel):
                 self.state = -10
             else:
                 self.state = -5
+            incident.event_now(
+                "email",
+                f"error sending email to: {email_to} - {self.subject}",
+                level=2,
+                subject=self.subject,
+                from_addr=self.from_addr,
+                to_addr=email_to,
+                details=self.reason)
         self.save()
         return True 
 

{django_restit-4.2.133 → django_restit-4.2.135}/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.135}/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.135}/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.135}/medialib/stores/s3.py

@@ -12,7 +12,11 @@ from medialib import utils
 import threading
 import tempfile
 
-S3 = objict(KEY=settings.AWS_KEY, SECRET=settings.AWS_SECRET, BUCKET=settings.AWS_S3_BUCKET)
+S3 = objict(
+    KEY=settings.AWS_KEY,
+    SECRET=settings.AWS_SECRET,
+    REGSION=settings.AWS_REGION,
+    BUCKET=settings.AWS_S3_BUCKET)
 
 
 class S3Item(object):

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

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

{django_restit-4.2.133 → django_restit-4.2.135}/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.135"

{django_restit-4.2.133 → django_restit-4.2.135}/rest/helpers.py

@@ -36,6 +36,8 @@ DEBUG_LOGGER = getLogger("debug", filename="debug.log")
 AUDITLOG_LOGGER_BY_USER = settings.get("AUDITLOG_LOGGER_BY_USER", False)
 AUDITLOG_LOGGERS = settings.get("AUDITLOG_LOGGERS", {})
 HELPER_CACHE = objict()
+UNKNOWN = object()
+
 
 def getLoggerByRequest(request):
     logger = AUDIT_LOGGER
@@ -277,6 +279,8 @@ def parseHostName(url, root=False):
         parsed_url = urlparse(url)
         hname = parsed_url.netloc
     else:
+        if "/" in url:
+            url = url[:url.find('/')]
         hname = url
     if root and hname.count('.') > 1:
         return hname[hname.find(".")+1:]

{django_restit-4.2.133 → django_restit-4.2.135}/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.135}/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):