simo 2.3.2__py3-none-any.whl → 2.3.4__py3-none-any.whl

simo/users/admin.py

@@ -25,16 +25,20 @@ class ComponentPermissionInline(admin.TabularInline):
 
 @admin.register(PermissionsRole)
 class PermissionsRoleAdmin(admin.ModelAdmin):
-    list_display = 'name', 'instance', 'is_superuser', 'is_default'
+    list_display = 'name', 'is_superuser', 'is_default'
     search_fields = 'name',
-    list_filter = 'instance',
     inlines = ComponentPermissionInline,
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         if request.user.is_master:
             return qs
-        return qs.filter(instance__in=request.user.instances)
+        return qs.filter(instance=request.instance)
+
+    def save_model(self, request, obj, form, change):
+        if not obj.id:
+            obj.instance = request.instance
+        obj.save()
 
     def get_fields(self, request, obj=None):
         if request.user.is_master:
@@ -49,7 +53,7 @@ class PermissionsRoleAdmin(admin.ModelAdmin):
 class InstanceUserInline(admin.TabularInline):
     model = InstanceUser
     extra = 0
-    readonly_fields = 'instance', 'at_home'
+    readonly_fields = 'at_home',
 
 
 @admin.register(User)
@@ -102,7 +106,7 @@ class UserAdmin(OrgUserAdmin):
         qs = super().get_queryset(request)
         if request.user.is_master:
             return qs
-        return qs.filter(instance_roles__instance__in=request.user.instances)
+        return qs.filter(instance_roles__instance=request.instance)
 
 
 from django.contrib.auth.models import Group
@@ -127,11 +131,9 @@ class UserDeviceLogInline(admin.ModelAdmin):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
-        if request.user.is_master:
-            return qs
         return qs.filter(
-            user_device__user__role__instance__in=request.user.instances
-        )
+            user_device__users__roles__instance=request.instance
+        ).distinct()
 
 
 @admin.register(UserDevice)
@@ -144,9 +146,7 @@ class UserDeviceAdmin(admin.ModelAdmin):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
-        if request.user.is_master:
-            return qs
-        return qs.filter(user__role__instance__in=request.user.instances)
+        return qs.filter(users__roles__instance=request.instance).distinct()
 
     def users_display(self, obj):
         return ', '.join([str(u) for u in obj.users.all()])
@@ -157,13 +157,12 @@ class UserDeviceAdmin(admin.ModelAdmin):
 @admin.register(InstanceInvitation)
 class InstanceInvitationAdmin(admin.ModelAdmin):
     list_display = (
-        'token', 'instance', 'from_user', 'to_email', 'role',
+        'token', 'from_user', 'to_email', 'role',
         'issue_date', 'taken_by', 'taken_date'
     )
     readonly_fields = (
         'token', 'issue_date', 'from_user', 'taken_by', 'taken_date'
     )
-    list_filter = 'instance',
 
     actions = ['send', ]
 
@@ -171,7 +170,7 @@ class InstanceInvitationAdmin(admin.ModelAdmin):
         qs = super().get_queryset(request)
         if request.user.is_master:
             return qs
-        return qs.filter(instance__in=request.user.instances)
+        return qs.filter(instance=request.instance)
 
     def send(self, request, queryset):
         invitations_sent = 0

simo/users/models.py

@@ -1,13 +1,13 @@
 import datetime
 import requests
 import subprocess
-from django.utils.functional import cached_property
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.db import models
 from django.db import transaction
 from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.dispatch import receiver
+from django.core.cache import cache
 from dirtyfields import DirtyFieldsMixin
 from django.contrib.gis.geos import Point
 from geopy.distance import distance
@@ -182,9 +182,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['name']
 
-    _instances = None
     _instance = None
-    _instance_roles = {}
 
     class Meta:
         verbose_name = _('user')
@@ -235,13 +233,16 @@ class User(AbstractBaseUser, SimoAdminMixin):
         return self.is_active and self.ssh_key and self.is_master
 
     def get_role(self, instance):
-        if instance.id not in self._instance_roles:
-            self._instance_roles[instance.id] = self.roles.filter(
+        cache_key = f'user-{self.id}_instance-{instance.id}_role'
+        role = cache.get(cache_key, 'expired')
+        if role == 'expired':
+            role = self.roles.filter(
                 instance=instance
             ).prefetch_related(
                 'component_permissions', 'component_permissions__component'
             ).first()
-        return self._instance_roles[instance.id]
+            cache.set(cache_key, role, 20)
+        return role
 
     def set_instance(self, instance):
         self._instance = instance
@@ -274,22 +275,23 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @property
     def instances(self):
-        if self._instances != None:
-            return self._instances
         from simo.core.models import Instance
-
-        self._instances = set()
         if not self.is_active:
-            return self._instance
-        if self.is_master:
-            self._instances = set(Instance.objects.all())
-            return self._instances
-
-        for instance_role in self.instance_roles.filter(
-            is_active=True, instance__isnull=False
-        ):
-            self._instances.add(instance_role.instance)
-        return self._instances
+            return Instance.objects.none()
+        cache_key = f'user-{self.id}_instances'
+        instances = cache.get(cache_key, 'expired')
+        if instances == 'expired':
+            if self.is_master:
+                instances = Instance.objects.all()
+            else:
+                instances = Instance.objects.filter(id__in=[
+                    r.instance.id for r in self.instance_roles.filter(
+                        is_active=True, instance__isnull=False
+                    )
+                ])
+            cache.set(cache_key, instances, 10)
+        print("INSTANCES: ", instances)
+        return instances
 
     @property
     def component_permissions(self):

{simo-2.3.2.dist-info → simo-2.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.3.2
+Version: 2.3.4
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.3.2.dist-info → simo-2.3.4.dist-info}/RECORD

@@ -3,15 +3,28 @@ simo/asgi.py,sha256=L8CUVZLM32IMzWDZ4IShdDN-m69t7oxAUeHods4-xNM,822
 simo/celeryc.py,sha256=eab7_e9rw0c__DCeoUFUh_tjAGVlulxVrk75BaJf57Q,1512
 simo/conf.py,sha256=H2BhXAV8MEDVXF8AbkaLSfR4ULd-9_bS4bnhE5sE5fg,112
 simo/scripting.py,sha256=PVIkGsiMDWj4CNTbOM3rq7pJ6ruavuns-ZMU7VudLa4,923
-simo/settings.py,sha256=E3hOPNASGnoNvhw_K3GbApsHjCnskJgEyeWYIQlEdxE,6913
+simo/settings.py,sha256=bwri9NuM9wjCacmUxzB1joy79Bu64tO0jEBZlJUeakc,6933
 simo/urls.py,sha256=fRmAsNQ_pzFloimLmxNeDcR6hHRJ3rOoZ3kGy8zOQ_A,2402
 simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8hDEtAdSwDJc,153
-simo/__pycache__/asgi.cpython-38.pyc,sha256=UI_puPxc6q4otRqtz0IALTwrh00975iGxc0UyQgLreQ,891
+simo/__pycache__/asgi.cpython-38.pyc,sha256=5W_YSKOIrRd6NQQuJDuA3Yuj688GzirXVVOyLe8wJIQ,845
 simo/__pycache__/celeryc.cpython-38.pyc,sha256=eSRoaKwfYlxVaxAiwqpQ2ndEcx7W-VpZtbxRFSV8UYg,1653
 simo/__pycache__/conf.cpython-38.pyc,sha256=MYP2yk3ULxiYwZsZR6tCLjKnU-z03A3avzQzIn66y3k,273
-simo/__pycache__/settings.cpython-38.pyc,sha256=FOalzITYVDHyqsGfbl8zNws0oBITfcs5XgHPao0QyLg,6065
+simo/__pycache__/settings.cpython-38.pyc,sha256=NdG2wtrRDI5YO1CfMzJuSGRARls5OnNJs7_XpLxGOQI,6083
 simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDXMYKAQ7w,2125
 simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0QA2pdWxo,322
+simo/backups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+simo/backups/admin.py,sha256=doPMTahbMtWHBpYDW2xh3tz2bkb6KqJXfH2cAeHUalM,533
+simo/backups/dynamic_settings.py,sha256=MrXECAxnpQjBf8yWug6qusSAyxRCtzBuQxfhFX8uV-c,560
+simo/backups/models.py,sha256=wjXvb8uXWGk_iqmbMBnX8owp5AYpj1WS0KteW4a0Fbk,463
+simo/backups/tasks.py,sha256=GueIJLZazeUZTfupe24k1m2IiflceSE610bL6KTXuAo,8496
+simo/backups/__pycache__/__init__.cpython-38.pyc,sha256=vzOf-JIMeZ6P85FyvTpYev3mscFosUy-SJTshcQbOHU,161
+simo/backups/__pycache__/admin.cpython-38.pyc,sha256=yT_AJOT6ypJl2iCQqphioMw2h0qm7N8IxDzEVF9RJWw,1027
+simo/backups/__pycache__/dynamic_settings.cpython-38.pyc,sha256=Ko0le9M96_zv4jv4zUsGUZTjEzNFQxr7NNjEwp2FRqU,900
+simo/backups/__pycache__/models.cpython-38.pyc,sha256=ifXK00chQNJZQL9QohBMTwH343Kt_CqVWUkuUQjnUX4,922
+simo/backups/migrations/0001_initial.py,sha256=0LzCusTUyYf61ksiepdnqXIuYYNTNd_djh_Wa484HA0,770
+simo/backups/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+simo/backups/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=jumm0xjwRhiYPOAXi4o-AGpcRi-GVOj5bSJkOTYtT7w,834
+simo/backups/migrations/__pycache__/__init__.cpython-38.pyc,sha256=Lz1fs6V05h2AoxTOLNye0do9bEMnyuaXB_hHOjG5-HU,172
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=hoJ0OhfWL9T0d6JCY6_Gm3GR-nrgtDR2UQM67rMsjiE,18141
 simo/core/api.py,sha256=laWtqQUL0ngjTtdDGqcUH42WYzWd9WYJwcKL3yCsDk4,27952
@@ -22,7 +35,7 @@ simo/core/apps.py,sha256=CsqpiQerhmrMsH-wGiG-gQgXd9qEkIi-LUaA9cXpKSw,425
 simo/core/auto_urls.py,sha256=nNXEgLAAAQAhRWQDA9AbDtw-zcPKmu_pufJaSa8g818,1102
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=qVh6MrXZEfN7bFOyFftC7u0yyz0PkvpsjllLBc6SCp4,616
-simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
+simo/core/context.py,sha256=x8ejZuyQsCRkbtlAyk2rLZ95RuI_5VPSWLolkfNOAf8,1360
 simo/core/controllers.py,sha256=rLgJqnEMzRC0GpZnQb0m_Cz43Gp2zaYbODU7UUxE5oA,29602
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
@@ -32,15 +45,15 @@ simo/core/forms.py,sha256=sFVz8tENhi4QSudORu_e5tlGEC0aXumy6wzJqQNYBPk,21904
 simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
-simo/core/middleware.py,sha256=LIMpHJDQ4zx9dfmy5z0-rEW2EPO9d-iG1ZJbJ_6t6hc,1927
+simo/core/middleware.py,sha256=v8i_7W_-ozucJXNm8beIhMGqEqMy8Xmtmj4AjdEnkQs,2720
 simo/core/models.py,sha256=hQA8SeAPtGRSs4gk-bci2Ni3ZANtS62V-IDgCyJh2qE,21563
 simo/core/permissions.py,sha256=v0iJM4LOeYoEfMiw3OLPYio272G1aUEAg_z9Wd1q5m0,2993
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=quXznnTKCm57rvRgke0mBnlWmaO8C5scJ8R251wa1jY,20869
+simo/core/serializers.py,sha256=1hcCnLnItw8T3jLWivKBjSAt7kwqjcOYE0vaepw55Z0,20966
 simo/core/signal_receivers.py,sha256=9-qFCCeSLcMFEMg6QUtKOVgUsoNoqhzGoI98nuNSTEo,6228
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=jMDuutrzPpKc-7hhjEnsw93CaedumPKLJU7LoXhGz6k,14233
+simo/core/tasks.py,sha256=SMrs1vjVgsHO9-QBLg4hTyTrd6gAUMchPXY6zHHkqOs,14205
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=VVqfEPzK0EdbVMMarkG8rd7cODG5QHpXnr3e8UdrTQE,2600
@@ -55,9 +68,9 @@ simo/core/__pycache__/apps.cpython-38.pyc,sha256=JL0BEqgXcSQvMlcK48PBpPfyDEkPMdO
 simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=Tyf8PYHq5YqSwTp25Joy-eura_Fm86fpX9zKLSklhvo,872
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=hJ6JILI1LqrAtpQMvxnLvljGdW1v1gpvBsD79vFkZ58,3972
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=hmq22vvGyCmhbYyuV6bFAOOSIupspgW5yq_VzqWd-vY,759
-simo/core/__pycache__/context.cpython-38.pyc,sha256=MSZPDhqMhCpUuBJl3HCIBHZA3BntYeP8RAnQcdqAH9k,1278
+simo/core/__pycache__/context.cpython-38.pyc,sha256=EbjtX2vOdl7-NA02zEwp_iUMKI2SSs-NZ-sHryo0GGY,1278
 simo/core/__pycache__/controllers.cpython-38.pyc,sha256=LA5Bnzev4kS3S8Ta0nfaVHQMIPfUDPYDL1GvfgHtIWg,26584
-simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=9ge2uV4QBKdA4f2pIZp4EIGB9vY2z4IUb-UMc4ZY0I4,2384
+simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=wGpnscX1DxFpRl54MQURhjz2aD3NJohSzw9JCFnzh2Y,2384
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
 simo/core/__pycache__/form_fields.cpython-38.pyc,sha256=u0voKXkA64xbH6LY_-jMBHQS4mOJZZeuB9WTvtv9JWE,3433
@@ -65,15 +78,15 @@ simo/core/__pycache__/forms.cpython-38.pyc,sha256=JDCNYJQrZHUaMb4qZ6A0f1JptoCHQK
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=D1ooHL-iSpQrxnD8uAl4xWFJmm-QWZfbkLiLlFOMtdU,4553
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
-simo/core/__pycache__/middleware.cpython-38.pyc,sha256=UZTX3tUUHkigr_3GiSLbUX3RbJBg1_JBPiXy6saJ9GA,1911
+simo/core/__pycache__/middleware.cpython-38.pyc,sha256=50q5tTJN_miDAlon_RElJ5dt6A1AlQS0W7CFA35WKKc,2404
 simo/core/__pycache__/models.cpython-38.pyc,sha256=h_neN4zzReOTuou4NX9RbgVJ8T47z0tLqSr37Fm1iHU,17874
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=fH4iyqd9DdzRLEu2b621-FeM-napR0M7hzBUTHo9Q3g,2972
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=PzKJTctrfXeTtD1QlRL5vKKIW4YxB5MuEPj_Z2w9Wgc,19495
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=xsGMcx9ISHmvY_PzWqosUdkWRBNqYKOtVkFDYNEHc1A,19479
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=3Bt9S47DR_ZFS3O-crElFgLLXPIYyDgPIc2ibwEkaic,4904
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=WHUW2vB78F0J-E_JX5SNW8Yieugam8Jqerg88NRJTDE,9533
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=arMCRz9NTDmE13KLvE4MCGwknvmmhYjTTqDpjZS93FI,9767
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
 simo/core/__pycache__/views.cpython-38.pyc,sha256=D7X_fFxYySe-mKNB4bEnIt9ubYM7CbbRcIpX52Ou4RE,2809
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
@@ -127,7 +140,7 @@ simo/core/drf_braces/tests/serializers/test_enforce_validation_serializer.py,sha
 simo/core/drf_braces/tests/serializers/test_form_serializer.py,sha256=IE2xQ1SzhSsOy2BFsBYw_Po-ujKBgIuNoTRxCzhyilE,12995
 simo/core/drf_braces/tests/serializers/test_swapping.py,sha256=o-B5YV5HDxHCVrXYGODeF7lB3rPDGtafNgClx97d6w4,1220
 simo/core/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/core/management/update.py,sha256=D8siHc9EFSJGUYcyw6hZqlYMm5HUzSnud4Ajm-noQCo,2365
+simo/core/management/update.py,sha256=Fj7-Zm4kvngPAE2NaUG21GOQfg86lKVtW79ZRH2sZD8,1795
 simo/core/management/__pycache__/__init__.cpython-38.pyc,sha256=Ptf1WzljXMt3wP1tzOy6q3JfLERYDs66wSHBVdrzjHg,169
 simo/core/management/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
 simo/core/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDEnjTQXycweRFmsSQ,27
@@ -139,7 +152,7 @@ simo/core/management/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE
 simo/core/management/_hub_template/hub/wsgi.py,sha256=Lo-huLHnMDTxSmMBOodVFMWBls9poddrV2KRzXU0xGo,280
 simo/core/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/management/commands/gateways_manager.py,sha256=a_JmUG1SPJhbhPh5QdViCT5DL0YvKQH-KsO8ptLhB34,6970
-simo/core/management/commands/on_http_start.py,sha256=uOhuaKlqYAjqqU1I3Alt1vD0nYdf-5OIDzps83S1riE,2225
+simo/core/management/commands/on_http_start.py,sha256=A2V40pyGY7AfONhtnxiGATOkqd0i9FUvRRxkwyAJF9k,2252
 simo/core/management/commands/run_gateway.py,sha256=bp0FQQoBeOSoxjHCCMicDL1fxPZZGyLgnq2QKht3bJo,645
 simo/core/management/commands/__pycache__/__init__.cpython-38.pyc,sha256=WKpfZZpAB9D7U4X6oWQIrU_H-6rUmq8Gl9fj9XaY2fw,178
 simo/core/management/commands/__pycache__/gateways_manager.cpython-38.pyc,sha256=pgEJdchhOcqKCpjdRMeF0_QKJfMmfSkl_W4TUwcgS9o,6031
@@ -10124,7 +10137,6 @@ simo/core/templates/admin/clearable_easy_thumbnails_widget.html,sha256=Gh0z_KIEt
 simo/core/templates/admin/component_change_list.html,sha256=N3seVjTkIRXIXKGsleB7oWUnPlMRXDIqOPqfEyq4PNE,3320
 simo/core/templates/admin/component_history.html,sha256=xiACt0w7EPrdmTOsi5XO07O-8LcL_XpCu9pSynmNNpI,541
 simo/core/templates/admin/formset_widget.html,sha256=NAonHNLyicsoE4Iir3My4AlVSz4Q7-1OA19zgsIOjJA,3563
-simo/core/templates/admin/formset_widget_old.html,sha256=rehM_tXl54d93vH0zbIv0QDJZb9rwmBqm5yiiHG31oM,4085
 simo/core/templates/admin/index.html,sha256=AJpt1FA4g6IAFQA99-3glJ88RmoWJ0YXBIz_DUt-R14,4015
 simo/core/templates/admin/item_name_display.html,sha256=Y3zk-rc-y8_6dC6_WrSy6tx6Z-6IZzZ5w3a1hMxlpz4,357
 simo/core/templates/admin/msg_page.html,sha256=C1T9fniV7cIiSBQXRFcSAsbt5Y_fshf6T6ZAE1e8hNw,738
@@ -10151,8 +10163,6 @@ simo/core/templates/core/object_acutocomplete_select_item.html,sha256=pS8APlv1Id
 simo/core/templates/core/openvpn_client.conf,sha256=z1838G8v8vmIiQKyfE8URCCMpLsges5jbX3hDJkztF4,249
 simo/core/templates/gis/my-openlayers-osm.html,sha256=ze4Gcl4fjrkKS1lONZHgpD-ybdI_N4zZcWBsBeyL4-A,1790
 simo/core/templates/gis/js/OLMapWidget.js,sha256=QOOHCR4CyAljFTtXTP_MNKN5RTplp3lvDKxHJj3J4KY,8813
-simo/core/templates/setup_wizard/clearable_easy_thumbnails_widget.html,sha256=DaN-86hqYMgi9j0zNFKEoqKMLsylrsJjj5FfUlhud4M,719
-simo/core/templates/setup_wizard/form.html,sha256=gBPXeB5d4e38iUguyEJi5CIIJWNPeb8tVVLEjuTRb8I,6630
 simo/core/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/templatetags/components_list.py,sha256=dcwXEgVrP2xuRpGpv1yQ_DHvmitsuF93PhDa9y69F2M,18540
 simo/core/templatetags/__pycache__/__init__.cpython-38.pyc,sha256=cvoEO0D7kCdN58Rztay2GihwqCVH0-FA8XRoFiQBSmk,171
@@ -10201,8 +10211,8 @@ simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
 simo/fleet/auto_urls.py,sha256=UX66eR2ykMqFgfIllW-RTdjup5-FieCWl_BVm3CcXKg,702
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=NOoM7XmMIJfqw92JE5PI6sQo-Vlzb67YDMtebUW7T9k,30507
-simo/fleet/forms.py,sha256=YF34ZCDbLeAKpq4u0KTi8IsyqhDtNUWcal2DELRayuI,57668
+simo/fleet/controllers.py,sha256=A9Bawj9x9JOjd_u8lmNhnWbGlZgqIIS7kbAuO0cNR6c,30506
+simo/fleet/forms.py,sha256=EG0QkxCePDMTTD6GPxj1TAwcUYEGyybsitUTx7CPiFM,57917
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=dJYDTHBz1OizzP51G0fdKHSuW98CsqBX-NhgjcVqYHY,16518
@@ -10218,8 +10228,8 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYe
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=Tc6a6BCXHjijP8U2jE2ghlJwnSNrGm59-hW5t-80wF0,689
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
-simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=Pot0NMkAvOR6YEX0UYVApcGlLzLQWS-zWSa7byDL8Zc,25373
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=LOxl1jynQbd_36Qa8eyTRkHLXiA575Ph29XVqGX0qsU,39066
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=7_GWIGJ2cNjrct6Vu3tSTjvxx6kNJDtTdyTTwsQ1k_8,25373
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=8LoC9PAnEEpQ2cVWT4REYvKcLKh7WPsHrJjNNogYgik,39202
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=pEiMWANjJpKXSR60PosKCUQOKpo6tSvCeWX4VP-0Lns,13796
@@ -10311,7 +10321,7 @@ simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
 simo/generic/controllers.py,sha256=tVI0Gz35dcHt3_5xlkAaXOy3fxlmtZ8L7ODQBtBumV0,58275
-simo/generic/forms.py,sha256=VzJJjZEuvpDEa2uObw9SkPmzQ4J_LkJ6UCNCoQImm0g,29427
+simo/generic/forms.py,sha256=qS7BDI2_w01XsgBKjisGE6XNSMNpmdrdxCEJqorapwA,29481
 simo/generic/gateways.py,sha256=cc_q_g2HsI2_rWmr8yZ3spnMPwsgoYS5ApWRimc11wU,18831
 simo/generic/models.py,sha256=flpK2jsBFghrvRHzl6IKT-t3WZ-hNOj4ZP2vmBzx0K8,7657
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
@@ -10320,11 +10330,11 @@ simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFI
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=0IoKRG9n1tkNRRkrqAeOQwWBPd_33u98JBcVtMVVCio,2374
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ptw6axyAqemZA35oa6vzr7EihzvbhW9w7Y-G6kfDedU,555
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=I9sGJNnAm9UOnnEoK5KR6IJ9q442El31AiY2hBnx1pI,36480
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=g-KKlxmRVWVN_mVOoXsuIGTNaVgs76BisphknIyD8vI,21071
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=bbuuS_Q7q7232hYrAPu-pn0WrGpKoMZSiGArOkQfHpc,21103
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=8NbsLVDww3Ov5DKF--LKgyrgnrn8yVcKrY21cdvV5aA,13979
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=n3FeTMJYh4B6nCPiPKeXiWsUOOWkLHca7qTvfTK6Iik,5844
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
-simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=piFHces0J9QuXu_CNBCQCYjoZEeoaxyVjLfJ9KaR8C8,1898
+simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=qJO5kvQLWhsQDOr1AtAtsAybuRWioxSkQei3Pc7rdP0,1737
 simo/generic/static/weather_icons/01d@2x.png,sha256=TZfWi6Rfddb2P-oldWWcjUiuCHiU9Yrc5hyrQAhF26I,948
 simo/generic/static/weather_icons/01n@2x.png,sha256=e9RleTa0T7To9Wi2wJ-9waeTbfHOsUB_xGwkx-89eEg,945
 simo/generic/static/weather_icons/02d@2x.png,sha256=ex522OxNzNNpSRGGzh7EmsBZi_MOFY-1IkQXTOMLL3I,1628
@@ -10398,7 +10408,7 @@ simo/notifications/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=YnO
 simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.pyc,sha256=Gkb3Qwr_zglGibQg9g5ekIgxtGapS4ENXVWQVHqM56I,794
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
-simo/users/admin.py,sha256=QQgan5_DyX22LdNFSWf2LHnTRO8gdQD4N295R-owuz0,6397
+simo/users/admin.py,sha256=oaLFTrjDaruKC_l79BB0etru4p8nP8eJFV3F4TSYGp4,6305
 simo/users/api.py,sha256=kUcdHm-WUn6z_AnFEXHnjYu8YX2MW1Z-NlAysRmSdLI,10333
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=bBSNXQJ88TRXaQxyh1aETfmOIfiDr08Jnj8rSY9sHDk,4074
@@ -10406,7 +10416,7 @@ simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/managers.py,sha256=M_51bk9z4jn8e2Ci3pJfIqbf6cRNqfQNSOAg0vPl6Vo,175
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=5ZMXBFExo1oO6vKYn4qOBSbgCp2kiAFNK82hm2k70vA,19195
+simo/users/models.py,sha256=0KGZZjXdzNHPRuS6uYo8PE3DBZDw6N9TU3zxiLpCQxs,19370
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=a4R408ZgWVbF7OFw4bBfN33Wnn8ljqS8iFcsqmllkWU,2552
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10415,7 +10425,7 @@ simo/users/tasks.py,sha256=HJAqiyWGsaN3wSfquU0UyQ20jL-njXeaaTOdDT3TQ3s,979
 simo/users/utils.py,sha256=7gU_TDnAOsDYqJM0CFo8efPah2bTXfGpXxRqzD5RiSs,1270
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
-simo/users/__pycache__/admin.cpython-38.pyc,sha256=zwD7hbwzZ4VwsQlrtG8j8KOqTRDQmhup-Y_hcbZDXD0,7315
+simo/users/__pycache__/admin.cpython-38.pyc,sha256=UgkqzfrSQU8Hyqig03Z5Qq29434wU27ttufxtvGEJYw,7433
 simo/users/__pycache__/api.cpython-38.pyc,sha256=25he7r5DHfcLYveXWhn6gQDV2R6YnpKbUVBNInR1q_s,8714
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=n5nx2QSXNj2idzRcGE6bAagMN-8qxoCs580H1EFZXls,3105
@@ -10423,7 +10433,7 @@ simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
 simo/users/__pycache__/managers.cpython-38.pyc,sha256=C5-diljm874RAFMTkZdcfzPhkHzlUGPAhz2gTvqkDy8,604
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-38.pyc,sha256=q5ROEWKeXud_MK3olV7aMTstmbl4hAYIjs7H8L_v4Jc,17817
+simo/users/__pycache__/models.cpython-38.pyc,sha256=MMCLklK0yVxhSsl2m8Z2xnAmnxSSCpFJcnXzx5TdQQM,18096
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=PuMy6H0PhEhq89RFmdnFH4pMHB0N3w7opJEFS90JUCY,3477
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
@@ -10507,9 +10517,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.3.2.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.3.2.dist-info/METADATA,sha256=8X6asyzMnCXBDSzz6WWtkxAxwJTk9HrOnXsshAZnwRY,1878
-simo-2.3.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-simo-2.3.2.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.3.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.3.2.dist-info/RECORD,,
+simo-2.3.4.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.3.4.dist-info/METADATA,sha256=9MnCb5wAiFArxz8ran42PeM_agigRqWcpJ7HYGH3VOY,1878
+simo-2.3.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+simo-2.3.4.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.3.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.3.4.dist-info/RECORD,,

simo/core/templates/admin/formset_widget_old.html

@@ -1,122 +0,0 @@
-{% load i18n admin_urls static admin_modify %}
-<style>
-    .formset-table th, .formset-table th .label{
-        font-weight: normal;
-        color: var(--body-quiet-color);
-    }
-    .formset-table .label.required{
-        font-weight: bold;
-    }
-    form .aligned .formset-table ul{
-        margin-left:0;
-    }
-    .errors .formset-table input, .errors .formset-table select,
-    .errors .formset-table textarea{
-        border: 1px solid var(--border-color);
-    }
-    .errors .formset-table .select2-selection{
-        border-color: #aaa;
-    }
-    .formset-table td.errors input, .formset-table td.errors select,
-    .formset-table td.errors textarea{
-        border: 1px solid var(--error-fg);
-    }
-    .formset-table td.errors .select2-selection{
-        border-color: var(--error-fg);
-    }
-    .formset-table td.drag {
-        cursor: pointer;
-        background-image: url(/static/adminsortable2/icons/drag.png);
-        background-repeat: repeat;
-        width: 20px;
-    }
-    .formset-table .inline-deletelink{
-        float: left
-    }
-</style>
-
-
-<div class="inline-group sortable" id="{{ formset.prefix }}-group">
-  <div class="tabular inline-related">
-{{ formset.management_form }}
-<fieldset class="module">
-   {{ formset.non_form_errors }}
-   <table class="formset-table">
-     <thead><tr>
-         <th>{% trans "Sort" %}</th>
-     {% for field in empty_form %}
-       {% if not field.is_hidden and not field.name == 'DELETE' %}
-         <th{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }}
-         {% if field.help_text %}&nbsp;<img src="{% static "admin/img/icon-unknown.svg" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %}
-         </th>
-       {% endif %}
-     {% endfor %}
-     {% if formset.can_delete %}<th>{% trans "Delete?" %}</th>{% endif %}
-     </tr></thead>
-
-     <tbody>
-     {% for form in formset %}
-        {% if form.non_field_errors %}
-          <tr><td colspan="{{ total_org_forms }}">{{ form.non_field_errors }}</td></tr>
-        {% endif %}
-
-        <tr class="form-row has_original" id="{{ formset.prefix }}-{{ forloop.counter0 }}">
-            <td class="drag">&nbsp;</td>
-            <td class="original hidden">
-              {% for field in form %}
-                {% if field.is_hidden %} {{ field }} {% endif %}
-              {% endfor %}
-            </td>
-
-            {% for field in form %}
-              {% if not field.is_hidden and not field.name == 'DELETE' %}
-              <td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
-                  {{ field }}
-                  {{ field.errors.as_ul }}
-              </td>
-              {% endif %}
-            {% endfor %}
-
-            {% if formset.can_delete %}
-              <td class="delete">{% if total_org_forms >= forloop.counter0 %}{{ form.DELETE }}{% endif %}</td>
-            {% endif %}
-        </tr>
-
-     {% endfor %}
-
-     <tr class="form-row empty-form" id="{{ formset.prefix }}-empty">
-        <td class="drag">&nbsp;</td>
-        <td class="original hidden">
-          {% for field in empty_form %}
-            {% if field.is_hidden %} {{ field }} {% endif %}
-          {% endfor %}
-        </td>
-
-        {% for field in empty_form %}
-          {% if not field.is_hidden and not field.name == 'DELETE' %}
-          <td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
-              {{ field }}
-              {{ field.errors.as_ul }}
-          </td>
-          {% endif %}
-        {% endfor %}
-
-        {% if formset.can_delete %}
-          <td class="delete"></td>
-        {% endif %}
-     </tr>
-
-     </tbody>
-   </table>
-</fieldset>
-  </div>
-</div>
-
-<script type="application/json" class="inline-tabular-config">
-{
-  "prefix": "{{ formset.prefix|escapejs }}",
-  "addText": "{% filter escapejs %}Add another{% endfilter %}",
-  "deleteText": "{% filter escapejs %}{% trans 'Remove' %}{% endfilter %}"
-}
-</script>
-<div class="default_order_field" default_order_field="ORDER" default_order_direction=""></div>

simo/core/templates/setup_wizard/clearable_easy_thumbnails_widget.html

@@ -1,15 +0,0 @@
-{% if widget.is_initial %}
-
-        <img style="width:100%; max-width:500px; margin-top: -20px; margin-bottom: 20px;" src="{{ widget.value.url }}">
-        {% if not widget.required %}
-
-
-            <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}"{% if widget.attrs.disabled %} disabled{% endif %}>
-            <span for="{{ widget.checkbox_id }}">{{ widget.clear_checkbox_label }}</span>
-
-        {% endif %}<br><br>
-
-    {% comment %} <span class="text-muted">{{ widget.input_text }}:</span> {% endcomment %}
-{% endif %}
-
-<input style="margin-top: -20px;" class="btn btn-secondary" type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>