django-restit 4.2.134__py3-none-any.whl → 4.2.136__py3-none-any.whl

account/models/group.py

@@ -132,14 +132,27 @@ class Group(models.Model, RestModel, MetaDataModel):
             ]
         }
 
+    _tz_long = None
+    _tz_short = None
+    _eod_hour = 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 end_of_day_hour(self):
+        if self._eod_hour is None:
+            self._eod_hour = self.getParentProperty("eod", 0, field_type=int)
+        return self._eod_hour
 
     @property
     def file_safe_name(self):
@@ -234,6 +247,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,35 +356,39 @@ 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")
-        return rh.convertToLocalTime(zone, when, tz_aware)
+        return rh.convertToLocalTime(self.timezone, when, tz_aware)
 
     def getUTC(self, when):
-        zone = self.getProperty("timezone", "America/Los_Angeles")
-        return rh.convertToUTC(zone, when)
+        return rh.convertToUTC(self.timezone, 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)
-        return rh.getDateRange(start, end, kind, zone, hour=eod)
+        return rh.getDateRange(start, end, kind, self.timezone, hour=self.end_of_day_hour)
 
     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)
-        return rh.getDateRange(start, end, kind, zone, hour=eod)
+        return rh.getDateRange(start, end, kind, self.timezone, hour=self.end_of_day_hour)
 
     def getTimeZoneOffset(self, when=None, hour=None):
-        zone = self.getProperty("timezone", "America/Los_Angeles")
-        return rh.getTimeZoneOffset(zone, when, hour=hour)
+        return rh.getTimeZoneOffset(self.timezone, 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.end_of_day_hour
             if in_local:
                 return eod
-        offset = self.getTimeZoneOffset(onday, hour=eod)
+        offset = self.getTimeZoneOffset(onday, hour=self.end_of_day_hour)
         return offset
 
     def updateUUID(self):

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,

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.134.dist-info → django_restit-4.2.136.dist-info}/METADATA

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

{django_restit-4.2.134.dist-info → django_restit-4.2.136.dist-info}/RECORD

@@ -28,11 +28,11 @@ account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
 account/models/device.py,sha256=0AFeLMGk4im4KZVd3eGSyRbK4eQEXiFM2cdY8GUzihs,5934
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
-account/models/group.py,sha256=KnLj0cOJBg1JYo33wL-7NehD4_PCsLyEjLdX6GZJZAo,22308
+account/models/group.py,sha256=N9Ow7AtV4xN5zSE9E5-msthJy0G5-3DEr2MTmvFO1kU,22887
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=7JCf7HULo_CLqKLGbHFvFOVYSkKbVkDuUPjq0C1u2Ak,54450
+account/models/member.py,sha256=FvVUoc_n7PgqxXduQRF-S4VJcl8aER5tMBxM5xsgswU,54682
 account/models/membership.py,sha256=90EpAhOsGaqphDAkONP6j_qQ0OWSRaQsI8H7E7fgMkE,9249
-account/models/notify.py,sha256=TOkuVBLAsbzT58FOxII_G3Cj_IDQx16vyehyEsNrDcY,15306
+account/models/notify.py,sha256=YKYEXT56i98b7-ydLt5UuEVOqW7lipQMi-KuiPhcSwY,15627
 account/models/passkeys.py,sha256=TJxITUi4DT4_1tW2K7ZlOcRjJuMVl2NtKz7pKQU8-Tw,1516
 account/models/session.py,sha256=ELkWjB_2KXQvPtRPrvuGJpJsqrxCQX_4J53SbqGz_2U,3737
 account/models/settings.py,sha256=gOyRWBVd3BQpjfj_hJPtqX3H46ztyRAFxBrPbv11lQg,2137
@@ -274,7 +274,7 @@ medialib/stores/oauth2client/tools.py,sha256=OLSW5Iu7rtjGankFpjXlHBw8aAFOcIsWdDh
 medialib/stores/oauth2client/util.py,sha256=1Uc6qwqNhI3b507VtFnklX4sEZNt0MZbLAME2o6kCgg,5706
 medialib/stores/oauth2client/xsrfutil.py,sha256=4Plq0y5xEkDwvrveVA32gBRP0A3FkJ_36dIsyGHeJeA,3367
 medialib/stores/rtmpstore.py,sha256=CFRP6Ss4hbLKngbdaLvA8_oKCSe18B29-oWVgvTXMPA,500
-medialib/stores/s3.py,sha256=behvLC-ftoMVddJmgK5jfZsC5PVjRBPrSgXkwngNP9A,6280
+medialib/stores/s3.py,sha256=puXareXUmcn6KdzOcLOY24i5dJUUewe7RNIduIBou9Y,6326
 medialib/stores/s3store.py,sha256=uKO6I-X83sD9xefCQytLyrV-7t9TSX2p476n_ZBkSHw,4583
 medialib/stores/uritemplate/__init__.py,sha256=ONWR_KRz9au0O-XUUTrO_UN7GHTmZCTKyvflUQb8wxM,4996
 medialib/stores/youtubestore.py,sha256=swXOJYfbhgzAv1NjOehjKtfYRZYk2wiPK7a7_boAulc,406
@@ -377,7 +377,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=YSY8pyO-bS3rDXGxnPSjIFrfIY1b-rATlrQzmmOQlMc,122
+rest/__init__.py,sha256=P7AsJG2-fQOZPMovCvkbEW57dyHqLdU0F4_ptZlHISg,122
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -393,7 +393,7 @@ rest/extra/hostinfo.py,sha256=5R23EafcNbFARyNEqdjBkqcpC8rPfmPd1zqNqle6-nM,4298
 rest/extra/json_metadata.py,sha256=p_ffzmANmOFix_oC3voR6_NNTjcn7-T7aXcH-I4_Npg,1078
 rest/fields.py,sha256=_v1TJVc6vyWlqmwFRJ6mtuR5Fo-lS0KcUhPWIrzKZUo,9719
 rest/forms.py,sha256=66Wm5cdy8tKib_mGicjq_yd-gNVMFWRECnrDksnNnwU,6316
-rest/helpers.py,sha256=PQ6-zTKZo85-TTI5BOO1sQVUFScirArnMz3X7_OpZN4,29450
+rest/helpers.py,sha256=t7smlOUzchVno-zeq7xMJIwogAR2DeSrffWxgysOHX8,29531
 rest/joke.py,sha256=0PpKaX2iN7jlS62kgjfmmqkFBYLPURz15aQ8R7OJkJ8,260
 rest/jwtoken.py,sha256=6AIe9IpsOn44sodiV0OPYeTZZNhS8VRiakV-rOuCyGw,2444
 rest/log.py,sha256=hd1_4HBOS395sfXJIL6BTw9yekm1SLgBwYx_PdfIhKA,20930
@@ -513,7 +513,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.134.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.134.dist-info/METADATA,sha256=LxqKyOSlOPA71uj2Qp3pJYUjXAliEynIVPEeOE_sNSc,7663
-django_restit-4.2.134.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.134.dist-info/RECORD,,
+django_restit-4.2.136.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.136.dist-info/METADATA,sha256=0XTqwV9RSBBDL7jfrwHLJoRI-Rr122bpMowDHQbuLCA,7663
+django_restit-4.2.136.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.136.dist-info/RECORD,,

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):

rest/__init__.py

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

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:]