From 8abc15e34175175ed58d94b22c4f069a8ff7e998 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 25 Jan 2021 19:03:15 +0100 Subject: [PATCH] replaced had_default_value with has_default_value --- pype/settings/entities/base_entity.py | 2 +- pype/settings/entities/input_entities.py | 12 ++++++------ pype/settings/entities/item_entities.py | 10 +++++++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pype/settings/entities/base_entity.py b/pype/settings/entities/base_entity.py index 9c4e30bdec..3fcea8088a 100644 --- a/pype/settings/entities/base_entity.py +++ b/pype/settings/entities/base_entity.py @@ -159,7 +159,7 @@ class BaseEntity: self.defaults_not_set = False # Default input attributes - self.had_default_value = False + self.has_default_value = False self.has_studio_override = False self.had_studio_override = False diff --git a/pype/settings/entities/input_entities.py b/pype/settings/entities/input_entities.py index c2966e1e56..473690545e 100644 --- a/pype/settings/entities/input_entities.py +++ b/pype/settings/entities/input_entities.py @@ -95,7 +95,7 @@ class InputEntity(ItemEntity): def update_default_value(self, value): # NOTE must call set_override_state manually self.default_value = value - self.had_default_value = value is not NOT_SET + self.has_default_value = value is not NOT_SET def update_studio_values(self, value): # NOTE must call set_override_state manually @@ -132,14 +132,14 @@ class InputEntity(ItemEntity): return True if self.override_state is OverrideState.DEFAULTS: - if not self.had_default_value: + if not self.has_default_value: return True elif self.override_state is OverrideState.STUDIO: if self.has_studio_override != self.had_studio_override: return True - if not self.has_studio_override and not self.had_default_value: + if not self.has_studio_override and not self.has_default_value: return True elif self.override_state is OverrideState.PROJECT: @@ -149,7 +149,7 @@ class InputEntity(ItemEntity): if ( not self.has_project_override and not self.has_studio_override - and not self.had_default_value + and not self.has_default_value ): return True return False @@ -195,9 +195,9 @@ class InputEntity(ItemEntity): if value is NOT_SET: value = self.value_on_not_set - self.had_default_value = False + self.has_default_value = False else: - self.had_default_value = True + self.has_default_value = True self.value_is_modified = False self._current_value = copy.deepcopy(value) diff --git a/pype/settings/entities/item_entities.py b/pype/settings/entities/item_entities.py index 75338c5bb3..5e82abba13 100644 --- a/pype/settings/entities/item_entities.py +++ b/pype/settings/entities/item_entities.py @@ -419,6 +419,7 @@ class DictImmutableKeysEntity(ItemEntity): return value, metadata def update_default_value(self, value): + self.has_default_value = value is not NOT_SET # TODO add value validation value, metadata = self._prepare_value(value) self.default_metadata = metadata @@ -778,6 +779,7 @@ class DictMutableKeysEntity(ItemEntity): return value, metadata def update_default_value(self, value): + self.has_default_value = value is not NOT_SET value, metadata = self._prepare_value(value) self.default_value = value self.default_metadata = metadata @@ -934,13 +936,14 @@ class ListEntity(ItemEntity): pass def update_default_value(self, value): - pass + self.has_default_value = value is not NOT_SET + self.default_value = value def update_studio_values(self, value): - pass + self.studio_override_value = value def update_project_values(self, value): - pass + self.project_override_value = value class PathEntity(ItemEntity): @@ -1163,6 +1166,7 @@ class ListStrictEntity(ItemEntity): def update_default_value(self, value): # TODO add value validation (length) # TODO current_value + self.has_default_value = value is not NOT_SET if value is NOT_SET: for child_obj in self.children: child_obj.update_default_value(value)