clear-skies 1.19.28__py3-none-any.whl → 1.19.29__py3-none-any.whl

{clear_skies-1.19.28.dist-info → clear_skies-1.19.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.19.28
+Version: 1.19.29
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.19.28.dist-info → clear_skies-1.19.29.dist-info}/RECORD

@@ -56,7 +56,7 @@ clearskies/backends/restful_api_advanced_search_backend.py,sha256=uiR4SEKhLNmczY
 clearskies/backends/secrets_backend.py,sha256=4lzrgdL_O_pgCT5HknV2gotFgp9GzjQ5_2n0-4H4kvs,2204
 clearskies/binding_config.py,sha256=bF8LBNEgJacwKCqToAtDqN9hv5omzU7zt_4qB9KPtE0,457
 clearskies/column_types/__init__.py,sha256=u9M34F9t5jsCHpE-_6MpoSqFh3WJyfHe8wF9UlMzFj0,4464
-clearskies/column_types/audit.py,sha256=smgAnDzNS5n3_1ESeyqn6KDv_1k6gOYRqrFb8S2_TrQ,9143
+clearskies/column_types/audit.py,sha256=2YcrZVVElpOUdmxYTQ_6CshL1HVou6fz65dOOs_b8Gw,9659
 clearskies/column_types/belongs_to.py,sha256=tH1tbTOfjifSNuVjO-KbMF7GiUIoLfcDItrrS3TGGM8,11044
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
 clearskies/column_types/category_tree.py,sha256=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
@@ -203,7 +203,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.19.28.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.19.28.dist-info/METADATA,sha256=SuWSER8vAnHiEAmLYsCs4P3r5no1Eva8_y_U9WQbFW0,1712
-clear_skies-1.19.28.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.19.28.dist-info/RECORD,,
+clear_skies-1.19.29.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.29.dist-info/METADATA,sha256=_9U68Hm392uXjqQs-x5bGay9azxktjOnXlxfs_LIsbk,1712
+clear_skies-1.19.29.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.29.dist-info/RECORD,,

clearskies/column_types/audit.py

@@ -131,9 +131,14 @@ class Audit(has_many.HasMany):
             for key in new_data.keys():
                 if key in exclude_columns:
                     continue
+                if key in parent_columns:
+                    column_data = parent_columns[key].to_json(model)
+                else:
+                    column_data = {key: new_data[key]}
+
                 create_data = {
                     **create_data,
-                    **parent_columns[key].to_json(model),
+                    **column_data,
                 }
                 if key in mask_columns and key in create_data:
                     create_data[key] = "****"
@@ -154,11 +159,19 @@ class Audit(has_many.HasMany):
                 continue
             from_data = {
                 **from_data,
-                **parent_columns[column].to_json(old_model),
+                **(
+                    parent_columns[column].to_json(old_model)
+                    if column in parent_columns
+                    else {column: old_data.get(column)}
+                ),
             }
             to_data = {
                 **to_data,
-                **parent_columns[column].to_json(model),
+                **(
+                    parent_columns[column].to_json(model)
+                    if column in parent_columns
+                    else {column: model._data.get(column)}
+                ),
             }
             if column in mask_columns and column in to_data:
                 to_data[column] = "****"
@@ -187,7 +200,7 @@ class Audit(has_many.HasMany):
                 continue
             final_data = {
                 **final_data,
-                **parent_columns[key].to_json(model),
+                **(parent_columns[key].to_json(model) if key in parent_columns else {key: model.data.get(key)}),
             }
 
         for key in mask_columns: