django-restit 4.2.133__py3-none-any.whl → 4.2.135__py3-none-any.whl

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)

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 
 

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

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

@@ -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.dist-info → django_restit-4.2.135.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=gsCze5dxTBcDayNalujAA-v8gKx3vC2cQwuUH6Jg9Tg,23100
 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
@@ -45,7 +45,7 @@ account/rpc/__init__.py,sha256=SGF0M_-H0dKh3b1apSX29BotNWAvITYccGQVC0MIjL8,336
 account/rpc/auth.py,sha256=p62tyihWvSY2zn7eaVxKcCG9qLnnZBIkwdRH81sS5_Y,16615
 account/rpc/device.py,sha256=lU2BHNPreHV0dDTjAPc7Sc-5m2JP8SiWVqiKuBfV7Fo,2281
 account/rpc/group.py,sha256=riymUK6ttv8G6SG6K-v7UCvM40WQy3HaGSeF_sEiaU0,4929
-account/rpc/member.py,sha256=VNRSD38mmTUCbq3cCSy3qRyquzeVEwW_8zzrtS0-vAA,1817
+account/rpc/member.py,sha256=8XnJX-iri0Om4nc-V2_tDJzfCSzziKLw6dUx9egtEZE,2236
 account/rpc/notify.py,sha256=Q2YWejP36egeF060Hih5uX4Psv_B8NWlLLPi7iDYlIw,3344
 account/rpc/oauth.py,sha256=ISLVsR5HvKALANokaOFRvF4FTRxWtXPvVnZAYANKxpo,2864
 account/rpc/passkeys.py,sha256=5x28nYILJUMMSwfVuWYL66hfoGUXahMqOwiHhM4I3Do,1729
@@ -72,7 +72,7 @@ auditlog/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 auditlog/models.py,sha256=skDAiuzR4chC-WNIaH2nm_VVcbnDD6ZtUxBwhk7UY8U,16517
 auditlog/periodic.py,sha256=AUhDeVsZtC47BJ-lklvYEegHoxAzj1RpIvRFSsM7g5E,363
 auditlog/rpc.py,sha256=gJgj3Wiar5pVsw8tuhy0jXLkqFkOr3Z-oI2DKelMRAQ,5592
-auditlog/tq.py,sha256=OgzJVspWI6FL92GEhDPtabYoP_Hd3zGNh0E297abz3Y,2415
+auditlog/tq.py,sha256=ROcCjQhCavOgW3-8yjLrboNTAYEC5Pu2UCoenom0Law,2478
 auditlog/urls.py,sha256=GNqpN74EpYlMND2UFUdPt5rOkTYYrdbTV0W3fg4zLfQ,163
 inbox/README.md,sha256=jsklDrzD5d94r7cwgaU6Gi1HCjBDfWq7jd92qB0JYPU,2169
 inbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -174,7 +174,7 @@ medialib/forms.py,sha256=nrE6QTPNPiIeX7Nx4l9DEmAQeQXqFyCg1C3JEDBYJfE,5442
 medialib/migrations/0001_initial.py,sha256=H3JliH5aw7tiHef8MhrJr_9rGetqgA7UjTF-eKziRSM,20518
 medialib/migrations/0002_alter_mediaitemrendition_bytes.py,sha256=igC1R02smbNoWlk2T4uCi9cNilOsxGKD-D24fQv92dM,414
 medialib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-medialib/models.py,sha256=eTfUiYrazCHMGcyBg9fPCRxx_NMOaM_MTb7vuUOymgc,54794
+medialib/models.py,sha256=hBq-xyUZB0X0TpYmywmMCuLFrOK4Su-zRfSGD1ULvk8,54995
 medialib/ocr.py,sha256=zlP7-NBiXhW7jR9pljmEPl5xzLVZpLN5QLAELQgU0Fk,1189
 medialib/pdf.py,sha256=l28WwM0JKbT9boV-b_9TFh9jhvGcrquR8GqC8wfEaLk,1275
 medialib/qrcode.py,sha256=vHyA5egXOX70EFiUDgr1njI9zcF6bXQJ_hKAQrppRow,545
@@ -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=UcJ4qn_3ls-tLEam46gewXaZeqzOJZ2DjbFhQy7G1j4,122
+rest/__init__.py,sha256=jvMDmcVTsAQ0iA0xPSbOztX_yr1rfxCPVRM4H93ysos,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
@@ -410,7 +410,7 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=dLgJcxDzSJDn8wsdZJaH7BkJDYTgkhnJX7-asolO6TA,70968
+rest/models/base.py,sha256=asj1ehoq_LLcm99PbyICGG9I_GQikxilrc52tTs2YBY,71301
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -486,7 +486,7 @@ wiki/migrations/0003_page_perms.py,sha256=qJBLI7t5mgiDTKCR9qhticmbhgo2KKYq7WbHax
 wiki/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wiki/models/__init__.py,sha256=jE-9r_Hqpyo7ysKu9BschXOn5Zg34wUt894GwJpxA28,132
 wiki/models/faq.py,sha256=nvcEFerllQKT61kIYlasvZzRKwpXyfmQpiqkpHP1V1o,1745
-wiki/models/page.py,sha256=06wyZsDX57B-d_wZhSNcrNAOv-ERHlKveJ15MZc9haQ,8751
+wiki/models/page.py,sha256=uIu-jVdf1Y9qXKbb5k15-8RLTltyTtoXobZJFcx8_0A,8836
 wiki/models/revision.py,sha256=St5-vz8SGvogsDL6jTWqHLE23PS5mp9iA0DUt3hWTsU,729
 wiki/periodic.py,sha256=t-UgXJIug-OLslJM_r03-5WrNKj39TxrvfuNFjVAhDs,334
 wiki/renderers/__init__.py,sha256=lLEoJvjU3ezXwBGcjleKk_kMyNeMD9MpfBlEiKayEiM,461
@@ -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.133.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.133.dist-info/METADATA,sha256=jMlQpj_jltlJ8hSiJoNQ5YmPrGumAhVk0L2nBVMi54s,7663
-django_restit-4.2.133.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.133.dist-info/RECORD,,
+django_restit-4.2.135.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.135.dist-info/METADATA,sha256=y5BF4iNU-96HCWsE7bLYHz9-lOK6htULuY729Hs6NwI,7663
+django_restit-4.2.135.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.135.dist-info/RECORD,,

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:

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.133"
+__version__ = "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:]

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:

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