Merge branch 'dev' into feature-bulk-edit

This commit is contained in:
jonaswinkler committed 2020-12-18 00:38:31 +01:00
commit 75b22e8684
62 files changed
+671 -210

No files matched your search

+5 -3
View File
@@ -187,17 +187,19 @@ class SavedViewSerializer(serializers.ModelSerializer):
else:
rules_data = None
super(SavedViewSerializer, self).update(instance, validated_data)
if rules_data:
if rules_data is not None:
SavedViewFilterRule.objects.filter(saved_view=instance).delete()
for rule_data in rules_data:
SavedViewFilterRule.objects.create(saved_view=instance, **rule_data)
SavedViewFilterRule.objects.create(
saved_view=instance, **rule_data)
return instance
def create(self, validated_data):
rules_data = validated_data.pop('filter_rules')
saved_view = SavedView.objects.create(**validated_data)
for rule_data in rules_data:
SavedViewFilterRule.objects.create(saved_view=saved_view, **rule_data)
SavedViewFilterRule.objects.create(
saved_view=saved_view, **rule_data)
return saved_view