simo 2.5.9__py3-none-any.whl → 2.5.11__py3-none-any.whl

simo/core/api.py

@@ -175,10 +175,10 @@ def get_components_queryset(instance, user):
         c_ids.add(state['id'])
 
     user_role = user.get_role(instance)
-
-    for cp in user_role.component_permissions.all():
-        if cp.read:
-            c_ids.add(cp.component.id)
+    if user_role:
+        for cp in user_role.component_permissions.all():
+            if cp.read:
+                c_ids.add(cp.component.id)
 
     return qs.filter(id__in=c_ids).select_related(
         'zone', 'category', 'icon'

simo/core/autocomplete_views.py

@@ -134,6 +134,8 @@ class ComponentAutocomplete(autocomplete.Select2QuerySetView):
         return qs.distinct()
 
     def get_result_label(self, item):
+        if self.request.META.get('HTTP_USER_AGENT') == 'SIMO-app':
+            return super().get_result_label(item)
         return render_to_string(
             'core/object_acutocomplete_select_item.html', {
                 'object': item

simo/core/serializers.py

@@ -104,6 +104,34 @@ class HiddenSerializerField(serializers.CharField):
 class TextAreaSerializerField(serializers.CharField):
     pass
 
+class ComponentPrimaryKeyRelatedField(PrimaryKeyRelatedField):
+
+    def get_attribute(self, instance):
+        if self.queryset.model in (Icon, Zone, Category):
+            return super().get_attribute(instance)
+        return self.queryset.model.objects.filter(
+            pk=instance.config.get(self.source_attrs[0])
+        ).first()
+
+
+class ComponentManyToManyRelatedField(serializers.Field):
+
+    def __init__(self, *args, **kwargs):
+        self.queryset = kwargs.pop('queryset')
+        self.choices = {obj.pk: str(obj) for obj in self.queryset}
+        self.allow_blank = kwargs.pop('allow_blank', False)
+        super().__init__(*args, **kwargs)
+
+
+    def to_representation(self, value):
+        return [obj.pk for obj in value.all()]
+
+    def to_internal_value(self, data):
+        if data == [] and self.allow_blank:
+            return []
+        return self.queryset.filter(pk__in=data)
+
+
 
 class ComponentFormsetField(FormSerializer):
 
@@ -114,6 +142,10 @@ class ComponentFormsetField(FormSerializer):
         field_mapping = {
             HiddenField: HiddenSerializerField,
             Select2ListChoiceField: serializers.ChoiceField,
+            Select2ModelChoiceField: ComponentPrimaryKeyRelatedField,
+            forms.ModelMultipleChoiceField: ComponentManyToManyRelatedField,
+            Select2ListMultipleChoiceField: ComponentManyToManyRelatedField,
+            Select2ModelMultipleChoiceField: ComponentManyToManyRelatedField,
             forms.ModelChoiceField: FormsetPrimaryKeyRelatedField,
             forms.TypedChoiceField: serializers.ChoiceField,
             forms.FloatField: serializers.FloatField,
@@ -167,8 +199,18 @@ class ComponentFormsetField(FormSerializer):
     def _get_field_kwargs(self, form_field, serializer_field_class):
         kwargs = super()._get_field_kwargs(form_field, serializer_field_class)
         kwargs['style'] = {'form_field': form_field}
-        if serializer_field_class == FormsetPrimaryKeyRelatedField:
-            kwargs['queryset'] = form_field.queryset
+
+        if serializer_field_class in (
+            ComponentPrimaryKeyRelatedField, ComponentManyToManyRelatedField
+        ):
+            qs = form_field.queryset
+            if hasattr(qs.model, 'instance'):
+                qs = qs.filter(instance=self.context['instance'])
+            elif hasattr(qs.model, 'instances'):
+                qs = qs.filter(instances=self.context['instance'])
+            elif qs.model == Component:
+                qs = qs.filter(zone__instance=self.context['instance'])
+            kwargs['queryset'] = qs
 
         attrs = find_matching_class_kwargs(form_field, serializer_field_class)
         if 'choices' in attrs:
@@ -176,6 +218,7 @@ class ComponentFormsetField(FormSerializer):
 
         return kwargs
 
+
     def to_representation(self, instance):
         """
         Object instance -> Dict of primitive datatypes.
@@ -211,32 +254,6 @@ class ComponentFormsetField(FormSerializer):
         return validated_data
 
 
-class ComponentPrimaryKeyRelatedField(PrimaryKeyRelatedField):
-
-    def get_attribute(self, instance):
-        if self.queryset.model in (Icon, Zone, Category):
-            return super().get_attribute(instance)
-        return self.queryset.model.objects.filter(
-            pk=instance.config.get(self.source_attrs[0])
-        ).first()
-
-
-class ComponentManyToManyRelatedField(serializers.Field):
-
-    def __init__(self, *args, **kwargs):
-        self.queryset = kwargs.pop('queryset')
-        self.choices = {obj.pk: str(obj) for obj in self.queryset}
-        self.allow_blank = kwargs.pop('allow_blank', False)
-        super().__init__(*args, **kwargs)
-
-
-    def to_representation(self, value):
-        return [obj.pk for obj in value.all()]
-
-    def to_internal_value(self, data):
-        if data == [] and self.allow_blank:
-            return []
-        return self.queryset.filter(pk__in=data)
 
 
 class ComponentSerializer(FormSerializer):
@@ -291,7 +308,6 @@ class ComponentSerializer(FormSerializer):
                 self.instance = Component.objects.filter(id=res[0]).first()
 
     def get_fields(self):
-
         self.set_form_cls()
 
         ret = OrderedDict()

simo/generic/forms.py

@@ -271,7 +271,7 @@ class PresenceLightingConfigForm(BaseComponentForm):
             ['lights', 'on_value', 'off_value', 'presence_sensors',
              'act_on', 'hold_time', 'conditions', 'autostart', 'keep_alive']
         )
-        if self.instance.pk:
+        if self.instance.pk and 'log' in self.fields:
             prefix = get_script_prefix()
             if prefix == '/':
                 prefix = ''

{simo-2.5.9.dist-info → simo-2.5.11.dist-info}/METADATA

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

{simo-2.5.9.dist-info → simo-2.5.11.dist-info}/RECORD

@@ -33,13 +33,13 @@ simo/backups/migrations/__pycache__/0004_alter_backup_options_alter_backuplog_op
 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=5mi0Qe9TM-OILCxbcRfGJvq397QCPxjYX30K3CIZrPs,18133
-simo/core/api.py,sha256=A8P47OFFcqw-AXQPF3XqIV3pshEyqQGwLdM8aByddns,28288
+simo/core/api.py,sha256=KIy7mpNbMWKtNPrcnbzeHXmPRboF5RPxmi_NssJXkQk,28317
 simo/core/api_auth.py,sha256=vCxvczA8aWNcW0VyKs5WlC_ytlqeGP_H_hkKUNVkCwM,1247
 simo/core/api_meta.py,sha256=EaiY-dCADP__9MvLpoHvhjytFT92IrxPZDv95xgqasU,4955
 simo/core/app_widgets.py,sha256=VxZzapuc-a29wBH7JzpvNF2SK1ECrgNUySId5ke1ffc,2509
 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/autocomplete_views.py,sha256=NEzZ27h5VRWqipwYdKrxlGl7GCaA_i8ho2nibpS6FiQ,4139
 simo/core/base_types.py,sha256=WypW8hTfzveuTQtruGjLYAGQZIuczxTlW-SdRk3iQug,666
 simo/core/context.py,sha256=snfPIGcZQTrx8iiZc5PI91A0dRQH6y5kH4uG_lfhU6Q,1486
 simo/core/controllers.py,sha256=JvXdwXD7iotA7fIjZmBVshKLQGSt9Na48FMAyHRDh84,35615
@@ -55,7 +55,7 @@ simo/core/middleware.py,sha256=hExD7Vmw7eitk0vAjOwKzkwrtuw8YxpflF92j_CA2YY,3193
 simo/core/models.py,sha256=Z6WLvU4K-LWIXghCBwTyZAOW5n2hCFNU-pteiPnpOAQ,22617
 simo/core/permissions.py,sha256=v0iJM4LOeYoEfMiw3OLPYio272G1aUEAg_z9Wd1q5m0,2993
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=JoMsGoeeTfnoNSdLPMlx4ZbaFyhtw5Kh4KpbAIUovX8,20869
+simo/core/serializers.py,sha256=i6AWIfhJq86AHs8jq3GrCfW3iSQDS3fQiLmcjHd3K5E,21593
 simo/core/signal_receivers.py,sha256=qCpzEUv5Bl9--K8fe08GVDmE6EBOj292YBia1TYDdSE,9267
 simo/core/socket_consumers.py,sha256=trRZvBGTJ7xIbfdmVvn7zoiWp_qssSkMZykDrI5YQyE,9783
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
@@ -88,7 +88,7 @@ simo/core/__pycache__/middleware.cpython-38.pyc,sha256=iOSTXSQl3sEsa-9kx_6w5zbEB
 simo/core/__pycache__/models.cpython-38.pyc,sha256=Nw2Fb11EwBdMVTHCpzkY6x0hRNCqRo0RtLNlRxS1VZE,18534
 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=S4eNvJkMZO98FQXgNGbeKBJihG5LXdnhl0tm2tjjXTE,19266
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=fN3kkfxFbQczNkAoghp_mjuXEuFhpiecd87MB3cXW6k,19483
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=lBVca6zNPVn3Ev98ekjPGzBR1MJk4xI19CyMcm4lf6A,7056
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=KqbO1cOewodVPcy0-htVefyUjCuELKV0o7fOfYqfgPc,8490
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
@@ -10337,7 +10337,7 @@ simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=vwYYVRKzKZ9XTvWTfEbaH4zpoHiDIHP6qFTNgZI-xvY,979
 simo/generic/base_types.py,sha256=Bvf3lv6PXx_SwtwBH7qpkwysWuloNcKNRh3LiuZf-Dc,359
 simo/generic/controllers.py,sha256=kGYdcuU7kpbhb6QeuOo4l-W82Zldh8vpdMnJRMKCkgU,49378
-simo/generic/forms.py,sha256=oAvWeYzLyWiNLRnXGa2124ICRD7GpLwwsF6i6L56HCI,29044
+simo/generic/forms.py,sha256=vXQ7bQV4SmYx5hbCIZFvCYZ3rJJfx4SpDJgNy8sCioE,29069
 simo/generic/gateways.py,sha256=dUzRBxVDdsx70mrCvxSQwhJr0ydQ5NtoLHoYeVLJmtA,15224
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
@@ -10551,9 +10551,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.5.9.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.9.dist-info/METADATA,sha256=seKSLClAKBnMi8ejXmRi6A8gouqbRobDzkzLi4yiFvc,1923
-simo-2.5.9.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.9.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.9.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.9.dist-info/RECORD,,
+simo-2.5.11.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.11.dist-info/METADATA,sha256=EA87aQ2mip3VAeGWmYPF2WzEPLqpjFR_cu7NSzd2XtE,1924
+simo-2.5.11.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.11.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.11.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.11.dist-info/RECORD,,